diff options
180 files changed, 3547 insertions, 735 deletions
diff --git a/api/current.txt b/api/current.txt index cc3c0ab..3f3d026 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28,7 +28,6 @@ package android { field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; - field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION"; field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE"; @@ -1862,28 +1861,28 @@ package android { field public static final int TextAppearance_Medium = 16973892; // 0x1030044 field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045 field public static final int TextAppearance_Quantum = 16974348; // 0x103020c - field public static final int TextAppearance_Quantum_Body1 = 16974545; // 0x10302d1 - field public static final int TextAppearance_Quantum_Body2 = 16974544; // 0x10302d0 - field public static final int TextAppearance_Quantum_Button = 16974548; // 0x10302d4 - field public static final int TextAppearance_Quantum_Caption = 16974546; // 0x10302d2 + field public static final int TextAppearance_Quantum_Body1 = 16974546; // 0x10302d2 + field public static final int TextAppearance_Quantum_Body2 = 16974545; // 0x10302d1 + field public static final int TextAppearance_Quantum_Button = 16974549; // 0x10302d5 + field public static final int TextAppearance_Quantum_Caption = 16974547; // 0x10302d3 field public static final int TextAppearance_Quantum_DialogWindowTitle = 16974349; // 0x103020d - field public static final int TextAppearance_Quantum_Display1 = 16974540; // 0x10302cc - field public static final int TextAppearance_Quantum_Display2 = 16974539; // 0x10302cb - field public static final int TextAppearance_Quantum_Display3 = 16974538; // 0x10302ca - field public static final int TextAppearance_Quantum_Display4 = 16974537; // 0x10302c9 - field public static final int TextAppearance_Quantum_Headline = 16974541; // 0x10302cd + field public static final int TextAppearance_Quantum_Display1 = 16974541; // 0x10302cd + field public static final int TextAppearance_Quantum_Display2 = 16974540; // 0x10302cc + field public static final int TextAppearance_Quantum_Display3 = 16974539; // 0x10302cb + field public static final int TextAppearance_Quantum_Display4 = 16974538; // 0x10302ca + field public static final int TextAppearance_Quantum_Headline = 16974542; // 0x10302ce field public static final int TextAppearance_Quantum_Inverse = 16974350; // 0x103020e field public static final int TextAppearance_Quantum_Large = 16974351; // 0x103020f field public static final int TextAppearance_Quantum_Large_Inverse = 16974352; // 0x1030210 field public static final int TextAppearance_Quantum_Medium = 16974353; // 0x1030211 field public static final int TextAppearance_Quantum_Medium_Inverse = 16974354; // 0x1030212 - field public static final int TextAppearance_Quantum_Menu = 16974547; // 0x10302d3 + field public static final int TextAppearance_Quantum_Menu = 16974548; // 0x10302d4 field public static final int TextAppearance_Quantum_SearchResult_Subtitle = 16974355; // 0x1030213 field public static final int TextAppearance_Quantum_SearchResult_Title = 16974356; // 0x1030214 field public static final int TextAppearance_Quantum_Small = 16974357; // 0x1030215 field public static final int TextAppearance_Quantum_Small_Inverse = 16974358; // 0x1030216 - field public static final int TextAppearance_Quantum_Subhead = 16974543; // 0x10302cf - field public static final int TextAppearance_Quantum_Title = 16974542; // 0x10302ce + field public static final int TextAppearance_Quantum_Subhead = 16974544; // 0x10302d0 + field public static final int TextAppearance_Quantum_Title = 16974543; // 0x10302cf field public static final int TextAppearance_Quantum_Widget = 16974360; // 0x1030218 field public static final int TextAppearance_Quantum_Widget_ActionBar_Menu = 16974361; // 0x1030219 field public static final int TextAppearance_Quantum_Widget_ActionBar_Subtitle = 16974362; // 0x103021a @@ -1932,9 +1931,10 @@ package android { field public static final int Theme = 16973829; // 0x1030005 field public static final int ThemeOverlay = 16974412; // 0x103024c field public static final int ThemeOverlay_Quantum = 16974413; // 0x103024d - field public static final int ThemeOverlay_Quantum_ActionBarWidget = 16974416; // 0x1030250 - field public static final int ThemeOverlay_Quantum_Dark = 16974415; // 0x103024f - field public static final int ThemeOverlay_Quantum_Light = 16974414; // 0x103024e + field public static final int ThemeOverlay_Quantum_ActionBar = 16974414; // 0x103024e + field public static final int ThemeOverlay_Quantum_Dark = 16974416; // 0x1030250 + field public static final int ThemeOverlay_Quantum_Dark_ActionBar = 16974417; // 0x1030251 + field public static final int ThemeOverlay_Quantum_Light = 16974415; // 0x103024f field public static final int Theme_Black = 16973832; // 0x1030008 field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009 field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a @@ -2324,126 +2324,126 @@ package android { field public static final int Widget_ProgressBar_Large_Inverse = 16973916; // 0x103005c field public static final int Widget_ProgressBar_Small = 16973854; // 0x103001e field public static final int Widget_ProgressBar_Small_Inverse = 16973917; // 0x103005d - field public static final int Widget_Quantum = 16974417; // 0x1030251 - field public static final int Widget_Quantum_ActionBar = 16974418; // 0x1030252 - field public static final int Widget_Quantum_ActionBar_Solid = 16974419; // 0x1030253 - field public static final int Widget_Quantum_ActionBar_TabBar = 16974420; // 0x1030254 - field public static final int Widget_Quantum_ActionBar_TabText = 16974421; // 0x1030255 - field public static final int Widget_Quantum_ActionBar_TabView = 16974422; // 0x1030256 - field public static final int Widget_Quantum_ActionButton = 16974423; // 0x1030257 - field public static final int Widget_Quantum_ActionButton_CloseMode = 16974424; // 0x1030258 - field public static final int Widget_Quantum_ActionButton_Overflow = 16974425; // 0x1030259 - field public static final int Widget_Quantum_ActionMode = 16974426; // 0x103025a - field public static final int Widget_Quantum_AutoCompleteTextView = 16974427; // 0x103025b - field public static final int Widget_Quantum_Button = 16974428; // 0x103025c - field public static final int Widget_Quantum_ButtonBar = 16974434; // 0x1030262 - field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974435; // 0x1030263 - field public static final int Widget_Quantum_Button_Borderless = 16974429; // 0x103025d - field public static final int Widget_Quantum_Button_Borderless_Small = 16974430; // 0x103025e - field public static final int Widget_Quantum_Button_Inset = 16974431; // 0x103025f - field public static final int Widget_Quantum_Button_Small = 16974432; // 0x1030260 - field public static final int Widget_Quantum_Button_Toggle = 16974433; // 0x1030261 - field public static final int Widget_Quantum_CalendarView = 16974436; // 0x1030264 - field public static final int Widget_Quantum_CheckedTextView = 16974437; // 0x1030265 - field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974438; // 0x1030266 - field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974439; // 0x1030267 - field public static final int Widget_Quantum_CompoundButton_Star = 16974440; // 0x1030268 - field public static final int Widget_Quantum_DatePicker = 16974441; // 0x1030269 - field public static final int Widget_Quantum_DropDownItem = 16974442; // 0x103026a - field public static final int Widget_Quantum_DropDownItem_Spinner = 16974443; // 0x103026b - field public static final int Widget_Quantum_EditText = 16974444; // 0x103026c - field public static final int Widget_Quantum_ExpandableListView = 16974445; // 0x103026d - field public static final int Widget_Quantum_FastScroll = 16974446; // 0x103026e - field public static final int Widget_Quantum_GridView = 16974447; // 0x103026f - field public static final int Widget_Quantum_HorizontalScrollView = 16974448; // 0x1030270 - field public static final int Widget_Quantum_ImageButton = 16974449; // 0x1030271 - field public static final int Widget_Quantum_Light = 16974476; // 0x103028c - field public static final int Widget_Quantum_Light_ActionBar = 16974477; // 0x103028d - field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974478; // 0x103028e - field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974479; // 0x103028f - field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974480; // 0x1030290 - field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974481; // 0x1030291 - field public static final int Widget_Quantum_Light_ActionButton = 16974482; // 0x1030292 - field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974483; // 0x1030293 - field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974484; // 0x1030294 - field public static final int Widget_Quantum_Light_ActionMode = 16974485; // 0x1030295 - field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974486; // 0x1030296 - field public static final int Widget_Quantum_Light_Button = 16974487; // 0x1030297 - field public static final int Widget_Quantum_Light_ButtonBar = 16974493; // 0x103029d - field public static final int Widget_Quantum_Light_ButtonBar_AlertDialog = 16974494; // 0x103029e - field public static final int Widget_Quantum_Light_Button_Borderless = 16974488; // 0x1030298 - field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974489; // 0x1030299 - field public static final int Widget_Quantum_Light_Button_Inset = 16974490; // 0x103029a - field public static final int Widget_Quantum_Light_Button_Small = 16974491; // 0x103029b - field public static final int Widget_Quantum_Light_Button_Toggle = 16974492; // 0x103029c - field public static final int Widget_Quantum_Light_CalendarView = 16974495; // 0x103029f - field public static final int Widget_Quantum_Light_CheckedTextView = 16974496; // 0x10302a0 - field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974497; // 0x10302a1 - field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974498; // 0x10302a2 - field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974499; // 0x10302a3 - field public static final int Widget_Quantum_Light_DropDownItem = 16974500; // 0x10302a4 - field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974501; // 0x10302a5 - field public static final int Widget_Quantum_Light_EditText = 16974502; // 0x10302a6 - field public static final int Widget_Quantum_Light_ExpandableListView = 16974503; // 0x10302a7 - field public static final int Widget_Quantum_Light_FastScroll = 16974504; // 0x10302a8 - field public static final int Widget_Quantum_Light_GridView = 16974505; // 0x10302a9 - field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974506; // 0x10302aa - field public static final int Widget_Quantum_Light_ImageButton = 16974507; // 0x10302ab - field public static final int Widget_Quantum_Light_ListPopupWindow = 16974508; // 0x10302ac - field public static final int Widget_Quantum_Light_ListView = 16974509; // 0x10302ad - field public static final int Widget_Quantum_Light_ListView_DropDown = 16974510; // 0x10302ae - field public static final int Widget_Quantum_Light_MediaRouteButton = 16974511; // 0x10302af - field public static final int Widget_Quantum_Light_PopupMenu = 16974512; // 0x10302b0 - field public static final int Widget_Quantum_Light_PopupMenu_Overflow = 16974513; // 0x10302b1 - field public static final int Widget_Quantum_Light_PopupWindow = 16974514; // 0x10302b2 - field public static final int Widget_Quantum_Light_ProgressBar = 16974515; // 0x10302b3 - field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974516; // 0x10302b4 - field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974517; // 0x10302b5 - field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974518; // 0x10302b6 - field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974519; // 0x10302b7 - field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974520; // 0x10302b8 - field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974521; // 0x10302b9 - field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974522; // 0x10302ba - field public static final int Widget_Quantum_Light_RatingBar = 16974523; // 0x10302bb - field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974524; // 0x10302bc - field public static final int Widget_Quantum_Light_RatingBar_Small = 16974525; // 0x10302bd - field public static final int Widget_Quantum_Light_ScrollView = 16974526; // 0x10302be - field public static final int Widget_Quantum_Light_SeekBar = 16974527; // 0x10302bf - field public static final int Widget_Quantum_Light_SegmentedButton = 16974528; // 0x10302c0 - field public static final int Widget_Quantum_Light_Spinner = 16974530; // 0x10302c2 - field public static final int Widget_Quantum_Light_StackView = 16974529; // 0x10302c1 - field public static final int Widget_Quantum_Light_Tab = 16974531; // 0x10302c3 - field public static final int Widget_Quantum_Light_TabWidget = 16974532; // 0x10302c4 - field public static final int Widget_Quantum_Light_TextView = 16974533; // 0x10302c5 - field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974534; // 0x10302c6 - field public static final int Widget_Quantum_Light_WebTextView = 16974535; // 0x10302c7 - field public static final int Widget_Quantum_Light_WebView = 16974536; // 0x10302c8 - field public static final int Widget_Quantum_ListPopupWindow = 16974450; // 0x1030272 - field public static final int Widget_Quantum_ListView = 16974451; // 0x1030273 - field public static final int Widget_Quantum_ListView_DropDown = 16974452; // 0x1030274 - field public static final int Widget_Quantum_MediaRouteButton = 16974453; // 0x1030275 - field public static final int Widget_Quantum_PopupMenu = 16974454; // 0x1030276 - field public static final int Widget_Quantum_PopupMenu_Overflow = 16974455; // 0x1030277 - field public static final int Widget_Quantum_PopupWindow = 16974456; // 0x1030278 - field public static final int Widget_Quantum_ProgressBar = 16974457; // 0x1030279 - field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974458; // 0x103027a - field public static final int Widget_Quantum_ProgressBar_Large = 16974459; // 0x103027b - field public static final int Widget_Quantum_ProgressBar_Small = 16974460; // 0x103027c - field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974461; // 0x103027d - field public static final int Widget_Quantum_RatingBar = 16974462; // 0x103027e - field public static final int Widget_Quantum_RatingBar_Indicator = 16974463; // 0x103027f - field public static final int Widget_Quantum_RatingBar_Small = 16974464; // 0x1030280 - field public static final int Widget_Quantum_ScrollView = 16974465; // 0x1030281 - field public static final int Widget_Quantum_SeekBar = 16974466; // 0x1030282 - field public static final int Widget_Quantum_SegmentedButton = 16974467; // 0x1030283 - field public static final int Widget_Quantum_Spinner = 16974469; // 0x1030285 - field public static final int Widget_Quantum_StackView = 16974468; // 0x1030284 - field public static final int Widget_Quantum_Tab = 16974470; // 0x1030286 - field public static final int Widget_Quantum_TabWidget = 16974471; // 0x1030287 - field public static final int Widget_Quantum_TextView = 16974472; // 0x1030288 - field public static final int Widget_Quantum_TextView_SpinnerItem = 16974473; // 0x1030289 - field public static final int Widget_Quantum_WebTextView = 16974474; // 0x103028a - field public static final int Widget_Quantum_WebView = 16974475; // 0x103028b + field public static final int Widget_Quantum = 16974418; // 0x1030252 + field public static final int Widget_Quantum_ActionBar = 16974419; // 0x1030253 + field public static final int Widget_Quantum_ActionBar_Solid = 16974420; // 0x1030254 + field public static final int Widget_Quantum_ActionBar_TabBar = 16974421; // 0x1030255 + field public static final int Widget_Quantum_ActionBar_TabText = 16974422; // 0x1030256 + field public static final int Widget_Quantum_ActionBar_TabView = 16974423; // 0x1030257 + field public static final int Widget_Quantum_ActionButton = 16974424; // 0x1030258 + field public static final int Widget_Quantum_ActionButton_CloseMode = 16974425; // 0x1030259 + field public static final int Widget_Quantum_ActionButton_Overflow = 16974426; // 0x103025a + field public static final int Widget_Quantum_ActionMode = 16974427; // 0x103025b + field public static final int Widget_Quantum_AutoCompleteTextView = 16974428; // 0x103025c + field public static final int Widget_Quantum_Button = 16974429; // 0x103025d + field public static final int Widget_Quantum_ButtonBar = 16974435; // 0x1030263 + field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974436; // 0x1030264 + field public static final int Widget_Quantum_Button_Borderless = 16974430; // 0x103025e + field public static final int Widget_Quantum_Button_Borderless_Small = 16974431; // 0x103025f + field public static final int Widget_Quantum_Button_Inset = 16974432; // 0x1030260 + field public static final int Widget_Quantum_Button_Small = 16974433; // 0x1030261 + field public static final int Widget_Quantum_Button_Toggle = 16974434; // 0x1030262 + field public static final int Widget_Quantum_CalendarView = 16974437; // 0x1030265 + field public static final int Widget_Quantum_CheckedTextView = 16974438; // 0x1030266 + field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974439; // 0x1030267 + field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974440; // 0x1030268 + field public static final int Widget_Quantum_CompoundButton_Star = 16974441; // 0x1030269 + field public static final int Widget_Quantum_DatePicker = 16974442; // 0x103026a + field public static final int Widget_Quantum_DropDownItem = 16974443; // 0x103026b + field public static final int Widget_Quantum_DropDownItem_Spinner = 16974444; // 0x103026c + field public static final int Widget_Quantum_EditText = 16974445; // 0x103026d + field public static final int Widget_Quantum_ExpandableListView = 16974446; // 0x103026e + field public static final int Widget_Quantum_FastScroll = 16974447; // 0x103026f + field public static final int Widget_Quantum_GridView = 16974448; // 0x1030270 + field public static final int Widget_Quantum_HorizontalScrollView = 16974449; // 0x1030271 + field public static final int Widget_Quantum_ImageButton = 16974450; // 0x1030272 + field public static final int Widget_Quantum_Light = 16974477; // 0x103028d + field public static final int Widget_Quantum_Light_ActionBar = 16974478; // 0x103028e + field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974479; // 0x103028f + field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974480; // 0x1030290 + field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974481; // 0x1030291 + field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974482; // 0x1030292 + field public static final int Widget_Quantum_Light_ActionButton = 16974483; // 0x1030293 + field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974484; // 0x1030294 + field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974485; // 0x1030295 + field public static final int Widget_Quantum_Light_ActionMode = 16974486; // 0x1030296 + field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974487; // 0x1030297 + field public static final int Widget_Quantum_Light_Button = 16974488; // 0x1030298 + field public static final int Widget_Quantum_Light_ButtonBar = 16974494; // 0x103029e + field public static final int Widget_Quantum_Light_ButtonBar_AlertDialog = 16974495; // 0x103029f + field public static final int Widget_Quantum_Light_Button_Borderless = 16974489; // 0x1030299 + field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974490; // 0x103029a + field public static final int Widget_Quantum_Light_Button_Inset = 16974491; // 0x103029b + field public static final int Widget_Quantum_Light_Button_Small = 16974492; // 0x103029c + field public static final int Widget_Quantum_Light_Button_Toggle = 16974493; // 0x103029d + field public static final int Widget_Quantum_Light_CalendarView = 16974496; // 0x10302a0 + field public static final int Widget_Quantum_Light_CheckedTextView = 16974497; // 0x10302a1 + field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974498; // 0x10302a2 + field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974499; // 0x10302a3 + field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974500; // 0x10302a4 + field public static final int Widget_Quantum_Light_DropDownItem = 16974501; // 0x10302a5 + field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974502; // 0x10302a6 + field public static final int Widget_Quantum_Light_EditText = 16974503; // 0x10302a7 + field public static final int Widget_Quantum_Light_ExpandableListView = 16974504; // 0x10302a8 + field public static final int Widget_Quantum_Light_FastScroll = 16974505; // 0x10302a9 + field public static final int Widget_Quantum_Light_GridView = 16974506; // 0x10302aa + field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974507; // 0x10302ab + field public static final int Widget_Quantum_Light_ImageButton = 16974508; // 0x10302ac + field public static final int Widget_Quantum_Light_ListPopupWindow = 16974509; // 0x10302ad + field public static final int Widget_Quantum_Light_ListView = 16974510; // 0x10302ae + field public static final int Widget_Quantum_Light_ListView_DropDown = 16974511; // 0x10302af + field public static final int Widget_Quantum_Light_MediaRouteButton = 16974512; // 0x10302b0 + field public static final int Widget_Quantum_Light_PopupMenu = 16974513; // 0x10302b1 + field public static final int Widget_Quantum_Light_PopupMenu_Overflow = 16974514; // 0x10302b2 + field public static final int Widget_Quantum_Light_PopupWindow = 16974515; // 0x10302b3 + field public static final int Widget_Quantum_Light_ProgressBar = 16974516; // 0x10302b4 + field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974517; // 0x10302b5 + field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974518; // 0x10302b6 + field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974519; // 0x10302b7 + field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974520; // 0x10302b8 + field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974521; // 0x10302b9 + field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974522; // 0x10302ba + field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974523; // 0x10302bb + field public static final int Widget_Quantum_Light_RatingBar = 16974524; // 0x10302bc + field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974525; // 0x10302bd + field public static final int Widget_Quantum_Light_RatingBar_Small = 16974526; // 0x10302be + field public static final int Widget_Quantum_Light_ScrollView = 16974527; // 0x10302bf + field public static final int Widget_Quantum_Light_SeekBar = 16974528; // 0x10302c0 + field public static final int Widget_Quantum_Light_SegmentedButton = 16974529; // 0x10302c1 + field public static final int Widget_Quantum_Light_Spinner = 16974531; // 0x10302c3 + field public static final int Widget_Quantum_Light_StackView = 16974530; // 0x10302c2 + field public static final int Widget_Quantum_Light_Tab = 16974532; // 0x10302c4 + field public static final int Widget_Quantum_Light_TabWidget = 16974533; // 0x10302c5 + field public static final int Widget_Quantum_Light_TextView = 16974534; // 0x10302c6 + field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974535; // 0x10302c7 + field public static final int Widget_Quantum_Light_WebTextView = 16974536; // 0x10302c8 + field public static final int Widget_Quantum_Light_WebView = 16974537; // 0x10302c9 + field public static final int Widget_Quantum_ListPopupWindow = 16974451; // 0x1030273 + field public static final int Widget_Quantum_ListView = 16974452; // 0x1030274 + field public static final int Widget_Quantum_ListView_DropDown = 16974453; // 0x1030275 + field public static final int Widget_Quantum_MediaRouteButton = 16974454; // 0x1030276 + field public static final int Widget_Quantum_PopupMenu = 16974455; // 0x1030277 + field public static final int Widget_Quantum_PopupMenu_Overflow = 16974456; // 0x1030278 + field public static final int Widget_Quantum_PopupWindow = 16974457; // 0x1030279 + field public static final int Widget_Quantum_ProgressBar = 16974458; // 0x103027a + field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974459; // 0x103027b + field public static final int Widget_Quantum_ProgressBar_Large = 16974460; // 0x103027c + field public static final int Widget_Quantum_ProgressBar_Small = 16974461; // 0x103027d + field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974462; // 0x103027e + field public static final int Widget_Quantum_RatingBar = 16974463; // 0x103027f + field public static final int Widget_Quantum_RatingBar_Indicator = 16974464; // 0x1030280 + field public static final int Widget_Quantum_RatingBar_Small = 16974465; // 0x1030281 + field public static final int Widget_Quantum_ScrollView = 16974466; // 0x1030282 + field public static final int Widget_Quantum_SeekBar = 16974467; // 0x1030283 + field public static final int Widget_Quantum_SegmentedButton = 16974468; // 0x1030284 + field public static final int Widget_Quantum_Spinner = 16974470; // 0x1030286 + field public static final int Widget_Quantum_StackView = 16974469; // 0x1030285 + field public static final int Widget_Quantum_Tab = 16974471; // 0x1030287 + field public static final int Widget_Quantum_TabWidget = 16974472; // 0x1030288 + field public static final int Widget_Quantum_TextView = 16974473; // 0x1030289 + field public static final int Widget_Quantum_TextView_SpinnerItem = 16974474; // 0x103028a + field public static final int Widget_Quantum_WebTextView = 16974475; // 0x103028b + field public static final int Widget_Quantum_WebView = 16974476; // 0x103028c field public static final int Widget_RatingBar = 16973857; // 0x1030021 field public static final int Widget_ScrollView = 16973869; // 0x103002d field public static final int Widget_SeekBar = 16973856; // 0x1030020 @@ -26183,20 +26183,6 @@ package android.service.textservice { } -package android.service.trust { - - public class TrustAgentService extends android.app.Service { - ctor public TrustAgentService(); - method public final void grantTrust(java.lang.CharSequence, long, boolean); - method public final android.os.IBinder onBind(android.content.Intent); - method public void onUnlockAttempt(boolean); - method public final void revokeTrust(); - field public static final java.lang.String SERVICE_INTERFACE = "android.service.trust.TrustAgentService"; - field public static final java.lang.String TRUST_AGENT_META_DATA = "android.service.trust.trustagent"; - } - -} - package android.service.voice { public class VoiceInteractionService extends android.app.Service { diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 77b1acf..d725873 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -34,7 +34,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.service.trust.TrustAgentService; import android.util.Log; import com.android.org.conscrypt.TrustedCertificateStore; @@ -1307,7 +1306,7 @@ public class DevicePolicyManager { public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 1 << 3; /** - * Ignore {@link TrustAgentService} state on secure keyguard screens + * Ignore trust agent state on secure keyguard screens * (e.g. PIN/Pattern/Password). */ public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 1 << 4; diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index a48a388..b96f166 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -870,6 +870,40 @@ public class ConnectivityManager { return 1; } + /** + * Removes the NET_CAPABILITY_NOT_RESTRICTED capability from the given + * NetworkCapabilities object if all the capabilities it provides are + * typically provided by restricted networks. + * + * TODO: consider: + * - Moving to NetworkCapabilities + * - Renaming it to guessRestrictedCapability and make it set the + * restricted capability bit in addition to clearing it. + * @hide + */ + public static void maybeMarkCapabilitiesRestricted(NetworkCapabilities nc) { + for (Integer capability : nc.getNetworkCapabilities()) { + switch (capability.intValue()) { + case NetworkCapabilities.NET_CAPABILITY_CBS: + case NetworkCapabilities.NET_CAPABILITY_DUN: + case NetworkCapabilities.NET_CAPABILITY_EIMS: + case NetworkCapabilities.NET_CAPABILITY_FOTA: + case NetworkCapabilities.NET_CAPABILITY_IA: + case NetworkCapabilities.NET_CAPABILITY_IMS: + case NetworkCapabilities.NET_CAPABILITY_RCS: + case NetworkCapabilities.NET_CAPABILITY_XCAP: + continue; + default: + // At least one capability usually provided by unrestricted + // networks. Conclude that this network is unrestricted. + return; + } + } + // All the capabilities are typically provided by restricted networks. + // Conclude that this network is restricted. + nc.removeNetworkCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); + } + private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) { if (networkType == TYPE_MOBILE) { int cap = -1; @@ -893,12 +927,14 @@ public class ConnectivityManager { NetworkCapabilities netCap = new NetworkCapabilities(); netCap.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); netCap.addNetworkCapability(cap); + maybeMarkCapabilitiesRestricted(netCap); return netCap; } else if (networkType == TYPE_WIFI) { if ("p2p".equals(feature)) { NetworkCapabilities netCap = new NetworkCapabilities(); netCap.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); netCap.addNetworkCapability(NetworkCapabilities.NET_CAPABILITY_WIFI_P2P); + maybeMarkCapabilitiesRestricted(netCap); return netCap; } } diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java index 98f70f4..b3fb560 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -17,6 +17,7 @@ package android.service.trust; import android.Manifest; +import android.annotation.PrivateApi; import android.annotation.SdkConstant; import android.app.Service; import android.content.ComponentName; @@ -33,6 +34,8 @@ import android.util.Slog; * A service that notifies the system about whether it believes the environment of the device * to be trusted. * + * <p>Trust agents may only be provided by the platform.</p> + * * <p>To extend this class, you must declare the service in your manifest file with * the {@link android.Manifest.permission#BIND_TRUST_AGENT} permission * and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p> @@ -54,7 +57,10 @@ import android.util.Slog; * <pre> * <trust-agent xmlns:android="http://schemas.android.com/apk/res/android" * android:settingsActivity=".TrustAgentSettings" /></pre> + * + * @hide */ +@PrivateApi public class TrustAgentService extends Service { private final String TAG = TrustAgentService.class.getSimpleName() + "[" + getClass().getSimpleName() + "]"; diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java index 1c9ab61..bb74c44 100644 --- a/core/java/android/widget/RadialTimePickerView.java +++ b/core/java/android/widget/RadialTimePickerView.java @@ -42,6 +42,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; + import com.android.internal.R; import java.text.DateFormatSymbols; @@ -82,13 +83,13 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { private static final int ALPHA_TRANSPARENT = 0; // Alpha level of color for selector. - private static final int ALPHA_SELECTOR = 51; + private static final int ALPHA_SELECTOR = 255; // was 51 // Alpha level of color for selected circle. private static final int ALPHA_AMPM_SELECTED = ALPHA_SELECTOR; // Alpha level of color for pressed circle. - private static final int ALPHA_AMPM_PRESSED = 175; + private static final int ALPHA_AMPM_PRESSED = 255; // was 175 private static final float COSINE_30_DEGREES = ((float) Math.sqrt(3)) * 0.5f; private static final float SINE_30_DEGREES = 0.5f; @@ -112,8 +113,15 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { private final String[] mAmPmText = new String[2]; private final Paint[] mPaint = new Paint[2]; + private final int[] mColor = new int[2]; + private final IntHolder[] mAlpha = new IntHolder[2]; + private final Paint mPaintCenter = new Paint(); + private final Paint[][] mPaintSelector = new Paint[2][3]; + private final int[][] mColorSelector = new int[2][3]; + private final IntHolder[][] mAlphaSelector = new IntHolder[2][3]; + private final Paint mPaintAmPmText = new Paint(); private final Paint[] mPaintAmPmCircle = new Paint[2]; @@ -309,65 +317,80 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { final Resources res = getResources(); mAmPmUnselectedColor = a.getColor(R.styleable.TimePicker_amPmUnselectedBackgroundColor, - res.getColor( - R.color.timepicker_default_ampm_unselected_background_color_holo_light)); + res.getColor(R.color.timepicker_default_ampm_unselected_background_color_quantum)); mAmPmSelectedColor = a.getColor(R.styleable.TimePicker_amPmSelectedBackgroundColor, - res.getColor(R.color.timepicker_default_ampm_selected_background_color_holo_light)); + res.getColor(R.color.timepicker_default_ampm_selected_background_color_quantum)); mAmPmTextColor = a.getColor(R.styleable.TimePicker_amPmTextColor, - res.getColor(R.color.timepicker_default_text_color_holo_light)); - - final int numbersTextColor = a.getColor(R.styleable.TimePicker_numbersTextColor, - res.getColor(R.color.timepicker_default_text_color_holo_light)); + res.getColor(R.color.timepicker_default_text_color_quantum)); mTypeface = Typeface.create("sans-serif", Typeface.NORMAL); + // Initialize all alpha values to opaque. + for (int i = 0; i < mAlpha.length; i++) { + mAlpha[i] = new IntHolder(ALPHA_OPAQUE); + } + for (int i = 0; i < mAlphaSelector.length; i++) { + for (int j = 0; j < mAlphaSelector[i].length; j++) { + mAlphaSelector[i][j] = new IntHolder(ALPHA_OPAQUE); + } + } + + final int numbersTextColor = a.getColor(R.styleable.TimePicker_numbersTextColor, + res.getColor(R.color.timepicker_default_text_color_quantum)); + mPaint[HOURS] = new Paint(); - mPaint[HOURS].setColor(numbersTextColor); mPaint[HOURS].setAntiAlias(true); mPaint[HOURS].setTextAlign(Paint.Align.CENTER); + mColor[HOURS] = numbersTextColor; mPaint[MINUTES] = new Paint(); - mPaint[MINUTES].setColor(numbersTextColor); mPaint[MINUTES].setAntiAlias(true); mPaint[MINUTES].setTextAlign(Paint.Align.CENTER); + mColor[MINUTES] = numbersTextColor; mPaintCenter.setColor(numbersTextColor); mPaintCenter.setAntiAlias(true); mPaintCenter.setTextAlign(Paint.Align.CENTER); mPaintSelector[HOURS][SELECTOR_CIRCLE] = new Paint(); - mPaintSelector[HOURS][SELECTOR_CIRCLE].setColor( - a.getColor(R.styleable.TimePicker_numbersSelectorColor, R.color.holo_blue_light)); mPaintSelector[HOURS][SELECTOR_CIRCLE].setAntiAlias(true); + mColorSelector[HOURS][SELECTOR_CIRCLE] = a.getColor( + R.styleable.TimePicker_numbersSelectorColor, + R.color.timepicker_default_selector_color_quantum); mPaintSelector[HOURS][SELECTOR_DOT] = new Paint(); - mPaintSelector[HOURS][SELECTOR_DOT].setColor( - a.getColor(R.styleable.TimePicker_numbersSelectorColor, R.color.holo_blue_light)); mPaintSelector[HOURS][SELECTOR_DOT].setAntiAlias(true); + mColorSelector[HOURS][SELECTOR_DOT] = a.getColor( + R.styleable.TimePicker_numbersSelectorColor, + R.color.timepicker_default_selector_color_quantum); mPaintSelector[HOURS][SELECTOR_LINE] = new Paint(); - mPaintSelector[HOURS][SELECTOR_LINE].setColor( - a.getColor(R.styleable.TimePicker_numbersSelectorColor, R.color.holo_blue_light)); mPaintSelector[HOURS][SELECTOR_LINE].setAntiAlias(true); mPaintSelector[HOURS][SELECTOR_LINE].setStrokeWidth(2); + mColorSelector[HOURS][SELECTOR_LINE] = a.getColor( + R.styleable.TimePicker_numbersSelectorColor, + R.color.timepicker_default_selector_color_quantum); mPaintSelector[MINUTES][SELECTOR_CIRCLE] = new Paint(); - mPaintSelector[MINUTES][SELECTOR_CIRCLE].setColor( - a.getColor(R.styleable.TimePicker_numbersSelectorColor, R.color.holo_blue_light)); mPaintSelector[MINUTES][SELECTOR_CIRCLE].setAntiAlias(true); + mColorSelector[MINUTES][SELECTOR_CIRCLE] = a.getColor( + R.styleable.TimePicker_numbersSelectorColor, + R.color.timepicker_default_selector_color_quantum); mPaintSelector[MINUTES][SELECTOR_DOT] = new Paint(); - mPaintSelector[MINUTES][SELECTOR_DOT].setColor( - a.getColor(R.styleable.TimePicker_numbersSelectorColor, R.color.holo_blue_light)); mPaintSelector[MINUTES][SELECTOR_DOT].setAntiAlias(true); + mColorSelector[MINUTES][SELECTOR_DOT] = a.getColor( + R.styleable.TimePicker_numbersSelectorColor, + R.color.timepicker_default_selector_color_quantum); mPaintSelector[MINUTES][SELECTOR_LINE] = new Paint(); - mPaintSelector[MINUTES][SELECTOR_LINE].setColor( - a.getColor(R.styleable.TimePicker_numbersSelectorColor, R.color.holo_blue_light)); mPaintSelector[MINUTES][SELECTOR_LINE].setAntiAlias(true); mPaintSelector[MINUTES][SELECTOR_LINE].setStrokeWidth(2); + mColorSelector[MINUTES][SELECTOR_LINE] = a.getColor( + R.styleable.TimePicker_numbersSelectorColor, + R.color.timepicker_default_selector_color_quantum); mPaintAmPmText.setColor(mAmPmTextColor); mPaintAmPmText.setTypeface(mTypeface); @@ -379,13 +402,12 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mPaintAmPmCircle[PM] = new Paint(); mPaintAmPmCircle[PM].setAntiAlias(true); - mPaintBackground.setColor( - a.getColor(R.styleable.TimePicker_numbersBackgroundColor, Color.WHITE)); + mPaintBackground.setColor(a.getColor(R.styleable.TimePicker_numbersBackgroundColor, + res.getColor(R.color.timepicker_default_numbers_background_color_quantum))); mPaintBackground.setAntiAlias(true); - final int disabledColor = a.getColor(R.styleable.TimePicker_disabledColor, - res.getColor(R.color.timepicker_default_disabled_color_holo_light)); - mPaintDisabled.setColor(disabledColor); + mPaintDisabled.setColor(a.getColor(R.styleable.TimePicker_disabledColor, + res.getColor(R.color.timepicker_default_disabled_color_quantum))); mPaintDisabled.setAntiAlias(true); if (DEBUG) { @@ -415,6 +437,8 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mSelectionRadiusMultiplier = Float.parseFloat( res.getString(R.string.timepicker_selection_radius_multiplier)); + a.recycle(); + setOnTouchListener(this); // Initial values @@ -622,21 +646,21 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mAmPmCircleRadiusMultiplier = Float.parseFloat( res.getString(R.string.timepicker_ampm_circle_radius_multiplier)); - mPaint[HOURS].setAlpha(mShowHours ? ALPHA_OPAQUE : ALPHA_TRANSPARENT); - mPaint[MINUTES].setAlpha(mShowHours ? ALPHA_TRANSPARENT : ALPHA_OPAQUE); + mAlpha[HOURS].setValue(mShowHours ? ALPHA_OPAQUE : ALPHA_TRANSPARENT); + mAlpha[MINUTES].setValue(mShowHours ? ALPHA_TRANSPARENT : ALPHA_OPAQUE); - mPaintSelector[HOURS][SELECTOR_CIRCLE].setAlpha( - mShowHours ?ALPHA_SELECTOR : ALPHA_TRANSPARENT); - mPaintSelector[HOURS][SELECTOR_DOT].setAlpha( + mAlphaSelector[HOURS][SELECTOR_CIRCLE].setValue( + mShowHours ? ALPHA_SELECTOR : ALPHA_TRANSPARENT); + mAlphaSelector[HOURS][SELECTOR_DOT].setValue( mShowHours ? ALPHA_OPAQUE : ALPHA_TRANSPARENT); - mPaintSelector[HOURS][SELECTOR_LINE].setAlpha( + mAlphaSelector[HOURS][SELECTOR_LINE].setValue( mShowHours ? ALPHA_SELECTOR : ALPHA_TRANSPARENT); - mPaintSelector[MINUTES][SELECTOR_CIRCLE].setAlpha( + mAlphaSelector[MINUTES][SELECTOR_CIRCLE].setValue( mShowHours ? ALPHA_TRANSPARENT : ALPHA_SELECTOR); - mPaintSelector[MINUTES][SELECTOR_DOT].setAlpha( + mAlphaSelector[MINUTES][SELECTOR_DOT].setValue( mShowHours ? ALPHA_TRANSPARENT : ALPHA_OPAQUE); - mPaintSelector[MINUTES][SELECTOR_LINE].setAlpha( + mAlphaSelector[MINUTES][SELECTOR_LINE].setValue( mShowHours ? ALPHA_TRANSPARENT : ALPHA_SELECTOR); } @@ -704,20 +728,23 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { calculateGridSizesMinutes(); drawCircleBackground(canvas); + drawSelector(canvas); drawTextElements(canvas, mTextSize[HOURS], mTypeface, mOuterTextHours, - mTextGridWidths[HOURS], mTextGridHeights[HOURS], mPaint[HOURS]); + mTextGridWidths[HOURS], mTextGridHeights[HOURS], mPaint[HOURS], + mColor[HOURS], mAlpha[HOURS].getValue()); if (mIs24HourMode && mInnerTextHours != null) { drawTextElements(canvas, mInnerTextSize, mTypeface, mInnerTextHours, - mInnerTextGridWidths, mInnerTextGridHeights, mPaint[HOURS]); + mInnerTextGridWidths, mInnerTextGridHeights, mPaint[HOURS], + mColor[HOURS], mAlpha[HOURS].getValue()); } drawTextElements(canvas, mTextSize[MINUTES], mTypeface, mOuterTextMinutes, - mTextGridWidths[MINUTES], mTextGridHeights[MINUTES], mPaint[MINUTES]); + mTextGridWidths[MINUTES], mTextGridHeights[MINUTES], mPaint[MINUTES], + mColor[MINUTES], mAlpha[MINUTES].getValue()); drawCenter(canvas); - drawSelector(canvas); if (!mIs24HourMode) { drawAmPm(canvas); } @@ -772,12 +799,12 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { // Draw the two circles mPaintAmPmCircle[AM].setColor(amColor); - mPaintAmPmCircle[AM].setAlpha(amAlpha); + mPaintAmPmCircle[AM].setAlpha(getMultipliedAlpha(amColor, amAlpha)); canvas.drawCircle(isLayoutRtl ? mRightIndicatorXCenter : mLeftIndicatorXCenter, mAmPmYCenter, mAmPmCircleRadius, mPaintAmPmCircle[AM]); mPaintAmPmCircle[PM].setColor(pmColor); - mPaintAmPmCircle[PM].setAlpha(pmAlpha); + mPaintAmPmCircle[PM].setAlpha(getMultipliedAlpha(pmColor, pmAlpha)); canvas.drawCircle(isLayoutRtl ? mLeftIndicatorXCenter : mRightIndicatorXCenter, mAmPmYCenter, mAmPmCircleRadius, mPaintAmPmCircle[PM]); @@ -792,6 +819,10 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { textYCenter, mPaintAmPmText); } + private int getMultipliedAlpha(int argb, int alpha) { + return (int) (Color.alpha(argb) * (alpha / 255.0) + 0.5); + } + private void drawSelector(Canvas canvas, int index) { // Calculate the current radius at which to place the selection circle. mLineLength[index] = (int) (mCircleRadius[index] @@ -802,15 +833,27 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { int pointX = mXCenter + (int) (mLineLength[index] * Math.sin(selectionRadians)); int pointY = mYCenter - (int) (mLineLength[index] * Math.cos(selectionRadians)); + int color; + int alpha; + Paint paint; + // Draw the selection circle - canvas.drawCircle(pointX, pointY, mSelectionRadius[index], - mPaintSelector[index % 2][SELECTOR_CIRCLE]); + color = mColorSelector[index % 2][SELECTOR_CIRCLE]; + alpha = mAlphaSelector[index % 2][SELECTOR_CIRCLE].getValue(); + paint = mPaintSelector[index % 2][SELECTOR_CIRCLE]; + paint.setColor(color); + paint.setAlpha(getMultipliedAlpha(color, alpha)); + canvas.drawCircle(pointX, pointY, mSelectionRadius[index], paint); // Draw the dot if needed if (mSelectionDegrees[index] % 30 != 0) { // We're not on a direct tick - canvas.drawCircle(pointX, pointY, (mSelectionRadius[index] * 2 / 7), - mPaintSelector[index % 2][SELECTOR_DOT]); + color = mColorSelector[index % 2][SELECTOR_DOT]; + alpha = mAlphaSelector[index % 2][SELECTOR_DOT].getValue(); + paint = mPaintSelector[index % 2][SELECTOR_DOT]; + paint.setColor(color); + paint.setAlpha(getMultipliedAlpha(color, alpha)); + canvas.drawCircle(pointX, pointY, (mSelectionRadius[index] * 2 / 7), paint); } else { // We're not drawing the dot, so shorten the line to only go as far as the edge of the // selection circle @@ -820,8 +863,12 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { } // Draw the line - canvas.drawLine(mXCenter, mYCenter, pointX, pointY, - mPaintSelector[index % 2][SELECTOR_LINE]); + color = mColorSelector[index % 2][SELECTOR_LINE]; + alpha = mAlphaSelector[index % 2][SELECTOR_LINE].getValue(); + paint = mPaintSelector[index % 2][SELECTOR_LINE]; + paint.setColor(color); + paint.setAlpha(getMultipliedAlpha(color, alpha)); + canvas.drawLine(mXCenter, mYCenter, pointX, pointY, paint); } private void drawDebug(Canvas canvas) { @@ -948,9 +995,11 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { * Draw the 12 text values at the positions specified by the textGrid parameters. */ private void drawTextElements(Canvas canvas, float textSize, Typeface typeface, String[] texts, - float[] textGridWidths, float[] textGridHeights, Paint paint) { + float[] textGridWidths, float[] textGridHeights, Paint paint, int color, int alpha) { paint.setTextSize(textSize); paint.setTypeface(typeface); + paint.setColor(color); + paint.setAlpha(getMultipliedAlpha(color, alpha)); canvas.drawText(texts[0], textGridWidths[3], textGridHeights[0], paint); canvas.drawText(texts[1], textGridWidths[4], textGridHeights[1], paint); canvas.drawText(texts[2], textGridWidths[5], textGridHeights[2], paint); @@ -1023,17 +1072,17 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { return animator; } - private static ObjectAnimator getFadeOutAnimator(Object target, int startAlpha, int endAlpha, + private static ObjectAnimator getFadeOutAnimator(IntHolder target, int startAlpha, int endAlpha, InvalidateUpdateListener updateListener) { int duration = 500; - ObjectAnimator animator = ObjectAnimator.ofInt(target, "alpha", startAlpha, endAlpha); + ObjectAnimator animator = ObjectAnimator.ofInt(target, "value", startAlpha, endAlpha); animator.setDuration(duration); animator.addUpdateListener(updateListener); return animator; } - private static ObjectAnimator getFadeInAnimator(Object target, int startAlpha, int endAlpha, + private static ObjectAnimator getFadeInAnimator(IntHolder target, int startAlpha, int endAlpha, InvalidateUpdateListener updateListener) { Keyframe kf0, kf1, kf2; int duration = 500; @@ -1048,7 +1097,7 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { kf0 = Keyframe.ofInt(0f, startAlpha); kf1 = Keyframe.ofInt(delayPoint, startAlpha); kf2 = Keyframe.ofInt(1f, endAlpha); - PropertyValuesHolder fadeIn = PropertyValuesHolder.ofKeyframe("alpha", kf0, kf1, kf2); + PropertyValuesHolder fadeIn = PropertyValuesHolder.ofKeyframe("value", kf0, kf1, kf2); ObjectAnimator animator = ObjectAnimator.ofPropertyValuesHolder( target, fadeIn).setDuration(totalDuration); @@ -1068,25 +1117,25 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mHoursToMinutesAnims.add(getRadiusDisappearAnimator(this, "animationRadiusMultiplierHours", mInvalidateUpdateListener, mTransitionMidRadiusMultiplier, mTransitionEndRadiusMultiplier)); - mHoursToMinutesAnims.add(getFadeOutAnimator(mPaint[HOURS], + mHoursToMinutesAnims.add(getFadeOutAnimator(mAlpha[HOURS], ALPHA_OPAQUE, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); - mHoursToMinutesAnims.add(getFadeOutAnimator(mPaintSelector[HOURS][SELECTOR_CIRCLE], + mHoursToMinutesAnims.add(getFadeOutAnimator(mAlphaSelector[HOURS][SELECTOR_CIRCLE], ALPHA_SELECTOR, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); - mHoursToMinutesAnims.add(getFadeOutAnimator(mPaintSelector[HOURS][SELECTOR_DOT], + mHoursToMinutesAnims.add(getFadeOutAnimator(mAlphaSelector[HOURS][SELECTOR_DOT], ALPHA_OPAQUE, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); - mHoursToMinutesAnims.add(getFadeOutAnimator(mPaintSelector[HOURS][SELECTOR_LINE], + mHoursToMinutesAnims.add(getFadeOutAnimator(mAlphaSelector[HOURS][SELECTOR_LINE], ALPHA_SELECTOR, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); mHoursToMinutesAnims.add(getRadiusReappearAnimator(this, "animationRadiusMultiplierMinutes", mInvalidateUpdateListener, mTransitionMidRadiusMultiplier, mTransitionEndRadiusMultiplier)); - mHoursToMinutesAnims.add(getFadeInAnimator(mPaint[MINUTES], + mHoursToMinutesAnims.add(getFadeInAnimator(mAlpha[MINUTES], ALPHA_TRANSPARENT, ALPHA_OPAQUE, mInvalidateUpdateListener)); - mHoursToMinutesAnims.add(getFadeInAnimator(mPaintSelector[MINUTES][SELECTOR_CIRCLE], + mHoursToMinutesAnims.add(getFadeInAnimator(mAlphaSelector[MINUTES][SELECTOR_CIRCLE], ALPHA_TRANSPARENT, ALPHA_SELECTOR, mInvalidateUpdateListener)); - mHoursToMinutesAnims.add(getFadeInAnimator(mPaintSelector[MINUTES][SELECTOR_DOT], + mHoursToMinutesAnims.add(getFadeInAnimator(mAlphaSelector[MINUTES][SELECTOR_DOT], ALPHA_TRANSPARENT, ALPHA_OPAQUE, mInvalidateUpdateListener)); - mHoursToMinutesAnims.add(getFadeInAnimator(mPaintSelector[MINUTES][SELECTOR_LINE], + mHoursToMinutesAnims.add(getFadeInAnimator(mAlphaSelector[MINUTES][SELECTOR_LINE], ALPHA_TRANSPARENT, ALPHA_SELECTOR, mInvalidateUpdateListener)); } @@ -1103,25 +1152,25 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mMinuteToHoursAnims.add(getRadiusDisappearAnimator(this, "animationRadiusMultiplierMinutes", mInvalidateUpdateListener, mTransitionMidRadiusMultiplier, mTransitionEndRadiusMultiplier)); - mMinuteToHoursAnims.add(getFadeOutAnimator(mPaint[MINUTES], + mMinuteToHoursAnims.add(getFadeOutAnimator(mAlpha[MINUTES], ALPHA_OPAQUE, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); - mMinuteToHoursAnims.add(getFadeOutAnimator(mPaintSelector[MINUTES][SELECTOR_CIRCLE], + mMinuteToHoursAnims.add(getFadeOutAnimator(mAlphaSelector[MINUTES][SELECTOR_CIRCLE], ALPHA_SELECTOR, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); - mMinuteToHoursAnims.add(getFadeOutAnimator(mPaintSelector[MINUTES][SELECTOR_DOT], + mMinuteToHoursAnims.add(getFadeOutAnimator(mAlphaSelector[MINUTES][SELECTOR_DOT], ALPHA_OPAQUE, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); - mMinuteToHoursAnims.add(getFadeOutAnimator(mPaintSelector[MINUTES][SELECTOR_LINE], + mMinuteToHoursAnims.add(getFadeOutAnimator(mAlphaSelector[MINUTES][SELECTOR_LINE], ALPHA_SELECTOR, ALPHA_TRANSPARENT, mInvalidateUpdateListener)); mMinuteToHoursAnims.add(getRadiusReappearAnimator(this, "animationRadiusMultiplierHours", mInvalidateUpdateListener, mTransitionMidRadiusMultiplier, mTransitionEndRadiusMultiplier)); - mMinuteToHoursAnims.add(getFadeInAnimator(mPaint[HOURS], + mMinuteToHoursAnims.add(getFadeInAnimator(mAlpha[HOURS], ALPHA_TRANSPARENT, ALPHA_OPAQUE, mInvalidateUpdateListener)); - mMinuteToHoursAnims.add(getFadeInAnimator(mPaintSelector[HOURS][SELECTOR_CIRCLE], + mMinuteToHoursAnims.add(getFadeInAnimator(mAlphaSelector[HOURS][SELECTOR_CIRCLE], ALPHA_TRANSPARENT, ALPHA_SELECTOR, mInvalidateUpdateListener)); - mMinuteToHoursAnims.add(getFadeInAnimator(mPaintSelector[HOURS][SELECTOR_DOT], + mMinuteToHoursAnims.add(getFadeInAnimator(mAlphaSelector[HOURS][SELECTOR_DOT], ALPHA_TRANSPARENT, ALPHA_OPAQUE, mInvalidateUpdateListener)); - mMinuteToHoursAnims.add(getFadeInAnimator(mPaintSelector[HOURS][SELECTOR_LINE], + mMinuteToHoursAnims.add(getFadeInAnimator(mAlphaSelector[HOURS][SELECTOR_LINE], ALPHA_TRANSPARENT, ALPHA_SELECTOR, mInvalidateUpdateListener)); } @@ -1393,4 +1442,20 @@ public class RadialTimePickerView extends View implements View.OnTouchListener { mInputEnabled = inputEnabled; invalidate(); } + + private static class IntHolder { + private int mValue; + + public IntHolder(int value) { + mValue = value; + } + + public void setValue(int value) { + mValue = value; + } + + public int getValue() { + return mValue; + } + } } diff --git a/core/java/android/widget/TimePickerDelegate.java b/core/java/android/widget/TimePickerDelegate.java index 79256e5..ba93ee5 100644 --- a/core/java/android/widget/TimePickerDelegate.java +++ b/core/java/android/widget/TimePickerDelegate.java @@ -140,13 +140,12 @@ class TimePickerDelegate extends TimePicker.AbstractTimePickerDelegate implement mSelectMinutes = res.getString(R.string.select_minutes); mHeaderSelectedColor = a.getColor(R.styleable.TimePicker_headerSelectedTextColor, - android.R.color.holo_blue_light); + R.color.timepicker_default_selector_color_quantum); - mHeaderUnSelectedColor = getUnselectedColor( - R.color.timepicker_default_text_color_holo_light); + mHeaderUnSelectedColor = getUnselectedColor(R.color.timepicker_default_text_color_quantum); if (mHeaderUnSelectedColor == -1) { mHeaderUnSelectedColor = a.getColor(R.styleable.TimePicker_headerUnselectedTextColor, - R.color.timepicker_default_text_color_holo_light); + R.color.timepicker_default_text_color_quantum); } final int headerBackgroundColor = a.getColor( @@ -296,7 +295,7 @@ class TimePickerDelegate extends TimePicker.AbstractTimePickerDelegate implement TypedArray a = mContext.obtainStyledAttributes(TEXT_APPEARANCE_TIME_LABEL_ATTR); final int textAppearanceResId = a.getResourceId(0, 0); tempView.setTextAppearance(mContext, (textAppearanceResId != 0) ? - textAppearanceResId : R.style.TextAppearance_Holo_TimePicker_TimeLabel); + textAppearanceResId : R.style.TextAppearance_Quantum_TimePicker_TimeLabel); a.recycle(); ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java index 419c582..cbd9a6a 100644 --- a/core/java/android/widget/Toolbar.java +++ b/core/java/android/widget/Toolbar.java @@ -1339,7 +1339,8 @@ public class Toolbar extends ViewGroup { return getPaddingTop(); case Gravity.BOTTOM: - return getPaddingBottom() - child.getMeasuredHeight() - lp.bottomMargin; + return getHeight() - getPaddingBottom() - + child.getMeasuredHeight() - lp.bottomMargin; default: case Gravity.CENTER_VERTICAL: diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java index 5db09f4..e8a3f0a 100644 --- a/core/java/com/android/internal/app/ToolbarActionBar.java +++ b/core/java/com/android/internal/app/ToolbarActionBar.java @@ -281,6 +281,9 @@ public class ToolbarActionBar extends ActionBar { @Override public void setNavigationMode(@NavigationMode int mode) { + if (mode == ActionBar.NAVIGATION_MODE_TABS) { + throw new IllegalArgumentException("Tabs not supported in this configuration"); + } mDecorToolbar.setNavigationMode(mode); } diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java index af82778..aa642fd 100644 --- a/core/java/com/android/internal/widget/ActionBarView.java +++ b/core/java/com/android/internal/widget/ActionBarView.java @@ -349,10 +349,7 @@ public class ActionBarView extends AbsActionBarView implements DecorToolbar { return mIncludeTabs; } - public void setEmbeddedTabView(View view) { - setEmbeddedTabView((ScrollingTabContainerView) view); - } - + @Override public void setEmbeddedTabView(ScrollingTabContainerView tabs) { if (mTabScrollView != null) { removeView(mTabScrollView); diff --git a/core/java/com/android/internal/widget/DecorToolbar.java b/core/java/com/android/internal/widget/DecorToolbar.java index ee6988e..5281045 100644 --- a/core/java/com/android/internal/widget/DecorToolbar.java +++ b/core/java/com/android/internal/widget/DecorToolbar.java @@ -71,7 +71,7 @@ public interface DecorToolbar { int getDisplayOptions(); void setDisplayOptions(int opts); - void setEmbeddedTabView(View tabView); + void setEmbeddedTabView(ScrollingTabContainerView tabView); boolean hasEmbeddedTabs(); boolean isTitleTruncated(); void setCollapsible(boolean collapsible); diff --git a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java index ea39eed..b298d85 100644 --- a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java +++ b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java @@ -397,8 +397,19 @@ public class ToolbarWidgetWrapper implements DecorToolbar { } @Override - public void setEmbeddedTabView(View tabView) { + public void setEmbeddedTabView(ScrollingTabContainerView tabView) { + if (mTabView != null && mTabView.getParent() == mToolbar) { + mToolbar.removeView(mTabView); + } mTabView = tabView; + if (tabView != null && mNavigationMode == ActionBar.NAVIGATION_MODE_TABS) { + mToolbar.addView(mTabView, 0); + Toolbar.LayoutParams lp = (Toolbar.LayoutParams) mTabView.getLayoutParams(); + lp.width = ViewGroup.LayoutParams.WRAP_CONTENT; + lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; + lp.gravity = Gravity.START | Gravity.BOTTOM; + tabView.setAllowCollapse(true); + } } @Override @@ -436,6 +447,11 @@ public class ToolbarWidgetWrapper implements DecorToolbar { mToolbar.removeView(mSpinner); } break; + case ActionBar.NAVIGATION_MODE_TABS: + if (mTabView != null && mTabView.getParent() == mToolbar) { + mToolbar.removeView(mTabView); + } + break; } mNavigationMode = mode; @@ -448,7 +464,14 @@ public class ToolbarWidgetWrapper implements DecorToolbar { mToolbar.addView(mSpinner, 0); break; case ActionBar.NAVIGATION_MODE_TABS: - throw new IllegalStateException("Tabs not supported in this configuration"); + if (mTabView != null) { + mToolbar.addView(mTabView, 0); + Toolbar.LayoutParams lp = (Toolbar.LayoutParams) mTabView.getLayoutParams(); + lp.width = ViewGroup.LayoutParams.WRAP_CONTENT; + lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; + lp.gravity = Gravity.START | Gravity.BOTTOM; + } + break; default: throw new IllegalArgumentException("Invalid navigation mode " + mode); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 9e378da..d844818 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2610,9 +2610,17 @@ android:label="@string/permlab_trust_listener" android:description="@string/permdesc_trust_listener" /> + <!-- Allows an application to provide a trust agent. + @hide For security reasons, this is a platform-only permission. --> + <permission android:name="android.permission.PROVIDE_TRUST_AGENT" + android:protectionLevel="signatureOrSystem" + android:label="@string/permlab_provide_trust_agent" + android:description="@string/permdesc_provide_trust_agent" /> + <!-- Must be required by an {@link android.service.trust.TrustAgentService}, - to ensure that only the system can bind to it. --> + to ensure that only the system can bind to it. + @hide --> <permission android:name="android.permission.BIND_TRUST_AGENT" android:protectionLevel="signature" android:label="@string/permlab_bind_trust_agent_service" diff --git a/core/res/res/transition/fade.xml b/core/res/res/transition/fade.xml new file mode 100644 index 0000000..22397d4 --- /dev/null +++ b/core/res/res/transition/fade.xml @@ -0,0 +1,16 @@ +<?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. +--> +<fade xmlns:android="http://schemas.android.com/apk/res/android"/> diff --git a/core/res/res/transition/move.xml b/core/res/res/transition/move.xml new file mode 100644 index 0000000..d4863ee --- /dev/null +++ b/core/res/res/transition/move.xml @@ -0,0 +1,30 @@ +<?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. +--> +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"> + <transitionSet> + <changeBounds/> + <changeTransform/> + <changeClipBounds/> + <targets> + <target android:excludeClass="android.widget.ImageView"/> + </targets> + </transitionSet> + <moveImage> + <targets> + <target android:targetClass="android.widget.ImageView"/> + </targets> + </moveImage> +</transitionSet> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index df59abe..b17b8c6 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -267,7 +267,7 @@ <string name="permdesc_statusBarService" msgid="716113660795976060">"Tillader, at appen er statusbjælken."</string> <string name="permlab_expandStatusBar" msgid="1148198785937489264">"udvid/skjul statuslinje"</string> <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"Tillader, at appen kan udvide og skjule statusbjælken."</string> - <string name="permlab_install_shortcut" msgid="4279070216371564234">"installer genveje"</string> + <string name="permlab_install_shortcut" msgid="4279070216371564234">"installere genveje"</string> <string name="permdesc_install_shortcut" msgid="8341295916286736996">"Tillader, at en applikation føjer genveje til startskærmen uden brugerindgriben."</string> <string name="permlab_uninstall_shortcut" msgid="4729634524044003699">"afinstaller genveje"</string> <string name="permdesc_uninstall_shortcut" msgid="6745743474265057975">"Tillader, at applikationen fjerner genveje på startskærmen uden brugerindgriben."</string> @@ -281,7 +281,7 @@ <string name="permdesc_receiveEmergencyBroadcast" msgid="848524070262431974">"Tillader, at appen kan modtage og behandle nødtransmissioner. Denne tilladelse er kun tilgængelig for systemapps."</string> <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"læse Cell Broadcast-beskeder"</string> <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillader, at appen læser Cell Broadcast-beskeder, der modtages af din enhed. I nogle områder sendes der Cell Broadcast-beskeder for at advare om nødsituationer. Ondsindede apps kan forstyrre ydelsen eller driften af din enhed, når der modtages en Cell Broadcast-besked om en nødsituation."</string> - <string name="permlab_sendSms" msgid="5600830612147671529">"send sms-beskeder"</string> + <string name="permlab_sendSms" msgid="5600830612147671529">"sende sms-beskeder"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Tillader, at appen kan sende sms-beskeder. Dette kan resultere i uventede opkrævninger. Skadelige apps kan koste dig penge ved at sende beskeder uden din bekræftelse."</string> <string name="permlab_sendRespondViaMessageRequest" msgid="8713889105305943200">"send hændelser, hvor der skal svares pr. besked"</string> <string name="permdesc_sendRespondViaMessageRequest" msgid="7107648548468778734">"Tillader, at appen kan sende anmodninger til andre apps til beskeder for at håndtere hændelser, hvor der skal svares pr. besked."</string> @@ -295,7 +295,7 @@ <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Tillader, at appen kan modtage og behandle WAP-beskeder. Denne tilladelse omfatter muligheden for at overvåge eller slette de beskeder, der sendes til dig, uden at vise dem til dig."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"hente kørende apps"</string> <string name="permdesc_getTasks" msgid="7454215995847658102">"Tillader, at appen kan hente oplysninger om nuværende og seneste opgaver. Med denne tilladelse kan appen finde oplysninger om, hvilke applikationer der bruges på enheden."</string> - <string name="permlab_interactAcrossUsers" msgid="7114255281944211682">"kommuniker på tværs af brugere"</string> + <string name="permlab_interactAcrossUsers" msgid="7114255281944211682">"kommunikere på tværs af brugere"</string> <string name="permdesc_interactAcrossUsers" msgid="364670963623385786">"Tillader, at appen udfører handlinger på tværs af forskellige brugere på enheden. Ondsindede apps kan bruge dette til at krænke beskyttelsen mellem brugere."</string> <string name="permlab_interactAcrossUsersFull" msgid="2567734285545074105">"fuld licens til at kommunikere på tværs af brugere"</string> <string name="permdesc_interactAcrossUsersFull" msgid="376841368395502366">"Tillader alle mulige former for kommunikation på tværs af brugere."</string> @@ -325,7 +325,7 @@ <string name="permdesc_forceStopPackages" msgid="5253157296183940812">"Tillader, at appen kan tvinge andre apps til at stoppe."</string> <string name="permlab_forceBack" msgid="652935204072584616">"tvinge appen til at lukke"</string> <string name="permdesc_forceBack" msgid="3892295830419513623">"Tillader, at appen kan tvinge enhver aktivitet i forgrunden til at lukke og gå tilbage. Bør aldrig være nødvendigt til almindelige apps."</string> - <string name="permlab_dump" msgid="1681799862438954752">"hent intern systemtilstand"</string> + <string name="permlab_dump" msgid="1681799862438954752">"hente intern systemtilstand"</string> <string name="permdesc_dump" msgid="1778299088692290329">"Tillader, at appen kan hente systemets interne tilstand. Ondsindede apps kan hente en lang række fortrolige og beskyttede oplysninger, som de normalt aldrig ville have brug for."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"hente skærmindhold"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Tillader, at appen kan hente indholdet i det aktive vindue. Ondsindede apps kan hente al indholdet i vinduet og undersøge al dens tekst med undtagelse af adgangskoder."</string> @@ -359,7 +359,7 @@ <string name="permdesc_batteryStats" msgid="5897346582882915114">"Tillader, at en applikation læser de aktuelle data for batteriforbruget. Kan tillade, at applikationen henter detaljerede oplysninger om, hvilke apps du bruger."</string> <string name="permlab_updateBatteryStats" msgid="3719689764536379557">"rediger batteristatistikker"</string> <string name="permdesc_updateBatteryStats" msgid="6862817857178025002">"Tillader, at appen kan ændre indsamlede batteristatistikker. Anvendes ikke af normale apps."</string> - <string name="permlab_getAppOpsStats" msgid="1508779687436585744">"hent statistikker for handlinger i appen"</string> + <string name="permlab_getAppOpsStats" msgid="1508779687436585744">"hente statistikker om handlinger i appen"</string> <string name="permdesc_getAppOpsStats" msgid="6243887041577912877">"Tillader, at appen indhenter statistikker for handlinger i applikationen. Denne handling bruges ikke i almindelige apps."</string> <string name="permlab_updateAppOpsStats" msgid="8829097373851521505">"lav ændringer i statistik for handlinger i appen"</string> <string name="permdesc_updateAppOpsStats" msgid="50784596594403483">"Tillader, at appen kan ændre indsamlede statistikker for handlinger i applikationen. Dette kan ikke bruges af almindelige apps."</string> @@ -474,7 +474,7 @@ <string name="permlab_writeContacts" msgid="5107492086416793544">"ændre dine kontaktpersoner"</string> <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Tillader, at appen kan ændre data om de kontaktpersoner, der er gemt på din tablet, f.eks. hvor ofte du har ringet til dem, sendt dem en e-mail eller på anden måde kommunikeret med bestemte kontaktpersoner. Med denne tilladelse kan apps slette kontaktoplysninger."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Tillader, at appen kan ændre data om de kontaktpersoner, der er gemt på din telefon, f.eks. hvor ofte du har ringet til dem, sendt en e-mail til dem eller på anden måde kommunikeret med bestemte kontaktpersoner. Med denne tilladelse kan apps slette kontaktoplysninger."</string> - <string name="permlab_readCallLog" msgid="3478133184624102739">"læs opkaldsliste"</string> + <string name="permlab_readCallLog" msgid="3478133184624102739">"læse opkaldsliste"</string> <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"Tillader, at appen kan læse din tablets opkaldsliste, f.eks. data om indgående og udgående opkald. Med denne tilladelse kan apps gemme dine opkaldslistedata, og skadelige apps kan dele opkaldslistedata uden din viden."</string> <string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"Tillader, at appen kan læse telefonens opkaldsliste, f.eks. data om indgående og udgående opkald. Med denne tilladelse kan apps gemme dine opkaldslistedata, og skadelige apps kan dele disse opkaldslistedata uden din viden."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"skriv opkaldsliste"</string> @@ -486,9 +486,9 @@ <string name="permdesc_writeProfile" product="default" msgid="5552084294598465899">"Tillader, at appen kan ændre eller tilføje oplysninger i din personlige profil, der er gemt på din enhed, f.eks. dit navn eller dine kontaktoplysninger. Dette betyder, at andre apps kan identificere dig og sende profiloplysninger til andre."</string> <string name="permlab_bodySensors" msgid="4871091374767171066">"kropssensorer (f.eks. pulsmålere)"</string> <string name="permdesc_bodySensors" product="default" msgid="2998865085124153531">"Tillader, at appen får adgang til data fra sensorer, du bruger til at måle, hvad der sker inde i din krop, f.eks. din puls."</string> - <string name="permlab_readSocialStream" product="default" msgid="1268920956152419170">"læs din sociale strøm"</string> + <string name="permlab_readSocialStream" product="default" msgid="1268920956152419170">"læse din sociale strøm"</string> <string name="permdesc_readSocialStream" product="default" msgid="4255706027172050872">"Tillader, at appen kan få adgang til og synkronisere sociale opdateringer fra dig og dine venner. Vær forsigtig, når du deler oplysninger – med denne tilladelse kan appen læse kommunikation mellem dig og dine venner på sociale netværk, uanset fortrolighed. Bemærk! Denne tilladelse håndhæves muligvis ikke på alle sociale netværk."</string> - <string name="permlab_writeSocialStream" product="default" msgid="3504179222493235645">"skriv i din sociale strøm"</string> + <string name="permlab_writeSocialStream" product="default" msgid="3504179222493235645">"skrive i din sociale strøm"</string> <string name="permdesc_writeSocialStream" product="default" msgid="3086557552204114849">"Tillader, at appen kan vise sociale opdateringer fra dine venner. Vær forsigtig, når du deler oplysninger – med denne tilladelse kan appen producere meddelelser, der kan synes at komme fra en ven. Bemærk! Denne tilladelse håndhæves muligvis ikke på alle sociale netværk."</string> <string name="permlab_readCalendar" msgid="5972727560257612398">"læse kalenderbegivenheder og fortrolige oplysninger"</string> <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"Tillader, at appen kan læse alle de kalenderbegivenheder, der er gemt på din tablet, f.eks. venners eller kollegers. Med denne tilladelse kan appen dele eller gemme dine kalenderdata, uanset fortrolighed eller følsomhed."</string> @@ -526,7 +526,7 @@ <string name="permdesc_captureSecureVideoOutput" msgid="2779793064709350289">"Tillader, at appen opfanger og omdirigerer et sikkert videooutput."</string> <string name="permlab_mediaContentControl" msgid="8749790560720562511">"kontrollér medieafspilning og metadataadgang"</string> <string name="permdesc_mediaContentControl" msgid="1637478200272062">"Tillader, at appen styrer medieafspilning og får adgang til medieoplysninger (titel, forfatter...)."</string> - <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"skift dine lydindstillinger"</string> + <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"skifte dine lydindstillinger"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Tillader, at appen kan ændre globale lydindstillinger, som f.eks. lydstyrke og hvilken højttaler der bruges til output."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"optage lyd"</string> <string name="permdesc_recordAudio" msgid="4906839301087980680">"Tillader, at appen kan optage lyd med mikrofonen. Med denne tilladelse kan appen til enhver tid optage lyd uden din bekræftelse."</string> @@ -632,7 +632,7 @@ <string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"Tillader, at appen kan oprette netværkssockets og bruge tilpassede netværksprotokoller. Browseren og andre applikationer indeholder midler til at sende data til internettet, så med denne tilladelse er der ingen forpligtelse til at sende data til internettet."</string> <string name="permlab_writeApnSettings" msgid="505660159675751896">"ændre/opfange netværksindstillinger og trafik"</string> <string name="permdesc_writeApnSettings" msgid="5333798886412714193">"Tillader, at appen kan ændre netværksindstillinger og opsnappe og inspicere al netværkstrafik, f.eks. for at ændre proxy og port for et adgangspunkt. Ondsindede apps kan overvåge, omdirigere eller ændre netværkspakker uden din viden."</string> - <string name="permlab_changeNetworkState" msgid="958884291454327309">"skift netværksforbindelse"</string> + <string name="permlab_changeNetworkState" msgid="958884291454327309">"skifte netværksforbindelse"</string> <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"Tillader, at appen kan ændre netværksforbindelsens tilstand."</string> <string name="permlab_changeTetherState" msgid="5952584964373017960">"skifte forbindelse til netdeling"</string> <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Tillader, at appen kan ændre tilstand for en netværksforbindelse via netdeling."</string> @@ -672,9 +672,9 @@ <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Tillader, at en app kan ændre synkroniseringsindstillingerne for en konto. Denne tilladelse kan f.eks. anvendes til at aktivere synkronisering af appen Personer med en konto."</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"læse synkroniseringsstatistikker"</string> <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Tillader, at en app kan læse synkroniseringsstatistikkerne for en konto, f.eks. historikken for synkroniserede begivenheder og hvor meget data der synkroniseres."</string> - <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"læs abonnerede feeds"</string> + <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"læse feeds, jeg abonnerer på"</string> <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Tillader, at appen kan hente oplysninger om de feeds, der synkroniseres."</string> - <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"skriv abonnerede feeds"</string> + <string name="permlab_subscribedFeedsWrite" msgid="9015246325408209296">"skrive feeds, som jeg abonnerer på"</string> <string name="permdesc_subscribedFeedsWrite" msgid="6928930188826089413">"Tillader, at appen kan ændre dine synkroniserede feeds. Ondsindede apps kan ændre dine synkroniserede feeds."</string> <string name="permlab_readDictionary" msgid="4107101525746035718">"læse termer, som du har føjet til ordbogen"</string> <string name="permdesc_readDictionary" msgid="659614600338904243">"Tillader, at appen kan læse alle ord, navne og sætninger, som brugeren har gemt i brugerordbogen."</string> @@ -995,7 +995,7 @@ <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"Tillader, at appen kan ændre browserens historik eller de bogmærker, der er gemt på din telefon. Dette kan give appen tilladelse til at slette eller ændre browserdata. Bemærk! Denne tilladelse håndhæves muligvis ikke af tredjepartsbrowsere eller andre applikationer med websøgningsfunktioner."</string> <string name="permlab_setAlarm" msgid="1379294556362091814">"indstille en alarm"</string> <string name="permdesc_setAlarm" msgid="316392039157473848">"Tillader, at appen kan indstille en alarm i en installeret alarmapp. Nogle alarmapps har muligvis ikke denne funktion."</string> - <string name="permlab_addVoicemail" msgid="5525660026090959044">"tilføj telefonsvarer"</string> + <string name="permlab_addVoicemail" msgid="5525660026090959044">"tilføje telefonsvarer"</string> <string name="permdesc_addVoicemail" msgid="6604508651428252437">"Tillader, at appen kan tilføje beskeder på din telefonsvarer."</string> <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"skifte tilladelser til geografisk placering i Browser"</string> <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"Tillader, at appen kan ændre browserens tilladelser angående geografisk placering. Ondsindede apps kan benytte dette til at sende oplysninger om placering til vilkårlige websites."</string> @@ -1275,7 +1275,7 @@ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Angiv dato"</string> <string name="date_time_set" msgid="5777075614321087758">"Angiv"</string> <string name="date_time_done" msgid="2507683751759308828">"Udført"</string> - <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"NYHED! "</font></string> + <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"NY: "</font></string> <string name="perms_description_app" msgid="5139836143293299417">"Leveret af <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> <string name="no_permissions" msgid="7283357728219338112">"Der kræves ingen tilladelser"</string> <string name="perm_costs_money" msgid="4902470324142151116">"dette kan koste dig penge"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 989eec6..d0561b9 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1471,8 +1471,8 @@ <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> <string name="activitychooserview_choose_application" msgid="2125168057199941199">"Επιλέξτε κάποια εφαρμογή"</string> <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Δεν ήταν δυνατή η εκκίνηση του <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> - <string name="shareactionprovider_share_with" msgid="806688056141131819">"Κοινοποίηση με"</string> - <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Κοινοποίηση με <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> + <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> <string name="keyboard_headset_required_to_hear_password" msgid="7011927352267668657">"Συνδέστε ακουστικά για να ακούσετε τα πλήκτρα του κωδικού πρόσβασης να εκφωνούνται."</string> @@ -1516,7 +1516,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> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index c8eca25..3d043c4 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -294,7 +294,7 @@ <string name="permlab_receiveWapPush" msgid="5991398711936590410">"recevoir des messages texte (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permet à l\'application de recevoir et de traiter les messages WAP. Cette autorisation lui donne la possibilité de surveiller ou supprimer les messages envoyés à votre appareil sans vous les montrer."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"récupérer les applications en cours d\'exécution"</string> - <string name="permdesc_getTasks" msgid="7454215995847658102">"Permet à l\'application de récupérer des informations sur des tâches en cours d\'exécution et récemment exécutées. L\'application est ainsi susceptible de d\'obtenir des informations sur les applications utilisées sur l\'appareil."</string> + <string name="permdesc_getTasks" msgid="7454215995847658102">"Permet à l\'application de récupérer des informations sur des tâches en cours d\'exécution et récemment exécutées. L\'application est ainsi susceptible d\'obtenir des informations sur les applications utilisées sur l\'appareil."</string> <string name="permlab_interactAcrossUsers" msgid="7114255281944211682">"interagir entre les utilisateurs"</string> <string name="permdesc_interactAcrossUsers" msgid="364670963623385786">"Permet à l\'application d\'effectuer des actions entre les différents utilisateurs de l\'appareil. Les applications malveillantes peuvent utiliser cette autorisation pour passer outre la protection entre les utilisateurs."</string> <string name="permlab_interactAcrossUsersFull" msgid="2567734285545074105">"autorisation totale d\'interagir entre les utilisateurs"</string> @@ -503,7 +503,7 @@ <string name="permlab_installLocationProvider" msgid="6578101199825193873">"autoriser l\'installation d\'un fournisseur de services de localisation"</string> <string name="permdesc_installLocationProvider" msgid="9066146120470591509">"Permet de créer des sources de localisation fictives à des fins de tests ou pour installer un nouveau fournisseur de position. L\'application peut ainsi modifier la position et/ou l\'état renvoyé par d\'autres sources de localisation telles que le GPS ou les fournisseurs de position."</string> <string name="permlab_accessFineLocation" msgid="1191898061965273372">"position précise (GPS et réseau)"</string> - <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Permet à l\'application d\'obtenir votre position exacte à l\'aide du récepteur satellite GPS ou des sources de localisation de réseau tels que les points d\'accès Wi-Fi et les antennes-relais. Ces services de localisation doivent être activés et disponibles sur votre appareil pour que l\'application puissent déterminer où vous vous trouvez, le cas échéant. Cette autorisation peut entraîner une utilisation accrue de la batterie."</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Permet à l\'application d\'obtenir votre position exacte à l\'aide du récepteur satellite GPS ou des sources de localisation de réseau tels que les points d\'accès Wi-Fi et les antennes-relais. Ces services de localisation doivent être activés et disponibles sur votre appareil pour que l\'application puisse déterminer où vous vous trouvez, le cas échéant. Cette autorisation peut entraîner une utilisation accrue de la batterie."</string> <string name="permlab_accessCoarseLocation" msgid="4887895362354239628">"position approximative (réseau)"</string> <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Permet à l\'application d\'obtenir votre position approximative. Celle-ci est fournie par des services de localisation sur la base des sources de localisation de réseau tels que les points d\'accès Wi-Fi et les antennes-relais. Ces services de localisation doivent être activés et disponibles sur votre appareil pour que l\'application puisse déterminer où vous vous trouvez de façon approximative, le cas échéant."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"Accès à SurfaceFlinger"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 000fb3a..2adaaf1 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -496,7 +496,7 @@ <string name="permlab_writeCalendar" msgid="8438874755193825647">"dodajte ili izmijenite kalendarske događaje i pošaljite e-poštu gostima bez znanja vlasnika"</string> <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"Aplikaciji omogućuje dodavanje, uklanjanje i promjenu događaja koje možete izmijeniti na tabletnom računalu, uključujući one od vaših prijatelja ili suradnika. To aplikaciji može omogućiti slanje poruka koje izgledaju kao da dolaze od vlasnika kalendara ili izmjenu događaja bez znanja vlasnika."</string> <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Aplikaciji omogućuje dodavanje, uklanjanje i promjenu događaja koje možete izmijeniti na telefonu, uključujući one od vaših prijatelja ili suradnika. To aplikaciji može omogućiti slanje poruka koje izgledaju kao da dolaze od vlasnika kalendara ili izmjenu događaja bez znanja vlasnika."</string> - <string name="permlab_accessMockLocation" msgid="8688334974036823330">"omogući testiranje izvora lokacije"</string> + <string name="permlab_accessMockLocation" msgid="8688334974036823330">"omogućeno testiranje izvora lokacije"</string> <string name="permdesc_accessMockLocation" msgid="5808711039482051824">"Stvaranje lažnih izvora lokacije radi testiranja ili za instaliranje novog pružatelja usluga lokacije. To aplikaciji omogućuje zaobilaženje lokacije i/ili statusa koji vraćaju drugi izvori lokacije, primjerice GPS ili pružatelji usluga lokacije."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"pristup dodatnim naredbama davatelja lokacije"</string> <string name="permdesc_accessLocationExtraCommands" msgid="5945166642335800763">"Aplikaciji omogućuje pristup dodatnim naredbama za pružatelja usluga lokacije. To aplikaciji može omogućiti ometanje rada GPS-a ili drugih izvora lokacije."</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 4640f2a..d235eaa 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -187,7 +187,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"การตั้งค่า"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="safeMode" msgid="2788228061547930246">"โหมดปลอดภัย"</string> - <string name="android_system_label" msgid="6577375335728551336">"ระบบ Android"</string> + <string name="android_system_label" msgid="6577375335728551336">"ระบบแอนดรอยด์"</string> <string name="user_owner_label" msgid="2804351898001038951">"ส่วนตัว"</string> <string name="managed_profile_label" msgid="6260850669674791528">"ที่ทำงาน"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"บริการที่ต้องเสียค่าใช้จ่าย"</string> @@ -424,7 +424,7 @@ <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"อนุญาตให้แอปพลิเคชันทำให้ส่วนหนึ่งของตัวเองคงอยู่ถาวรในหน่วยความจำ ซึ่งจะจำกัดพื้นที่หน่วยความจำที่ใช้งานได้ของแอปพลิเคชันอื่นๆ และทำให้แท็บเล็ตทำงานช้าลง"</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">"อนุญาตให้แอปพลิเคชันลบแพ็กเกจแอนดรอยด์แอปพลิเคชันที่เป็นอันตรายอาจใช้การอนุญาตนี้ลบแอปพลิเคชันที่สำคัญ"</string> <string name="permlab_clearAppUserData" msgid="274109191845842756">"ลบข้อมูลของแอปพลิเคชันอื่น"</string> <string name="permdesc_clearAppUserData" msgid="4625323684125459488">"อนุญาตให้แอปพลิเคชันล้างข้อมูลผู้ใช้"</string> <string name="permlab_deleteCacheFiles" msgid="3128665571837408675">"ลบแคชของแอปพลิเคชันอื่น"</string> @@ -432,7 +432,7 @@ <string name="permlab_getPackageSize" msgid="7472921768357981986">"วัดพื้นที่เก็บข้อมูลของแอปพลิเคชัน"</string> <string name="permdesc_getPackageSize" msgid="3921068154420738296">"อนุญาตให้แอปพลิเคชันเรียกดูรหัส ข้อมูล และขนาดแคชของตน"</string> <string name="permlab_installPackages" msgid="2199128482820306924">"ติดตั้งแอปพลิเคชันโดยตรง"</string> - <string name="permdesc_installPackages" msgid="5628530972548071284">"อนุญาตให้แอปพลิเคชันติดตั้งแพ็กเกจ Android ใหม่หรือที่อัปเดต แอปพลิเคชันที่เป็นอันตรายอาจใช้การอนุญาตนี้ในการเพิ่มแอปพลิเคชันใหม่ๆ ด้วยสิทธิ์ที่สูงนี้ได้ตามต้องการ"</string> + <string name="permdesc_installPackages" msgid="5628530972548071284">"อนุญาตให้แอปพลิเคชันติดตั้งแพ็กเกจแอนดรอยด์ใหม่หรือที่อัปเดต แอปพลิเคชันที่เป็นอันตรายอาจใช้การอนุญาตนี้ในการเพิ่มแอปพลิเคชันใหม่ๆ ด้วยสิทธิ์ที่สูงนี้ได้ตามต้องการ"</string> <string name="permlab_clearAppCache" msgid="7487279391723526815">"ลบข้อมูลแคชของแอปพลิเคชันทั้งหมด"</string> <string name="permdesc_clearAppCache" product="tablet" msgid="8974640871945434565">"อนุญาตให้แอปพลิเคชันสร้างพื้นที่ว่างในที่จัดเก็บข้อมูลของแท็บเล็ต โดยลบไฟล์ในไดเรกทอรีแคชของแอปพลิเคชันอื่นๆ ซึ่งอาจทำให้แอปพลิเคชันอื่นเริ่มทำงานช้ากว่าเดิมเนื่องจากต้องดึงข้อมูลของตนซ้ำ"</string> <string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"อนุญาตให้แอปพลิเคชันสร้างพื้นที่ว่างในที่จัดเก็บข้อมูลของโทรศัพท์ โดยลบไฟล์ในไดเรกทอรีแคชของแอปพลิเคชันอื่นๆ ซึ่งอาจทำให้แอปพลิเคชันอื่นเริ่มทำงานช้ากว่าเดิมเนื่องจากต้องดึงข้อมูลของตนซ้ำ"</string> @@ -1190,7 +1190,7 @@ <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> + <string name="android_upgrading_title" msgid="1584192285441405746">"กำลังอัปเกรดแอนดรอยด์..."</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"กำลังเพิ่มประสิทธิภาพแอปพลิเคชัน <xliff:g id="NUMBER_0">%1$d</xliff:g> จาก <xliff:g id="NUMBER_1">%2$d</xliff:g> รายการ"</string> <string name="android_upgrading_starting_apps" msgid="451464516346926713">"กำลังเริ่มต้นแอปพลิเคชัน"</string> <string name="android_upgrading_complete" msgid="1405954754112999229">"เสร็จสิ้นการบูต"</string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 2db6bec..0811c02 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6130,10 +6130,12 @@ <!-- Use <code>trust-agent</code> as the root tag of the XML resource that describes an {@link android.service.trust.TrustAgentService}, which is referenced from its {@link android.service.trust.TrustAgentService#TRUST_AGENT_META_DATA} - meta-data entry. Described here are the attributes that can be included in that tag. --> + meta-data entry. Described here are the attributes that can be included in that tag. + @hide --> <declare-styleable name="TrustAgent"> <!-- Component name of an activity that allows the user to modify - the settings for this trust agent. --> + the settings for this trust agent. + @hide --> <attr name="settingsActivity" /> </declare-styleable> diff --git a/core/res/res/values/colors_quantum.xml b/core/res/res/values/colors_quantum.xml index 5986403..dffc9b0 100644 --- a/core/res/res/values/colors_quantum.xml +++ b/core/res/res/values/colors_quantum.xml @@ -151,4 +151,15 @@ <color name="quantum_brown_300">#ffa1887f</color> <color name="quantum_brown_500">#ff795548</color> <color name="quantum_brown_700">#ff5d4037</color> + + <!-- Time picker defaults when no theme is set --> + <eat-comment /> + + <color name="timepicker_default_background_quantum">@color/primary_text_default_quantum_light</color> + <color name="timepicker_default_text_color_quantum">@color/black</color> + <color name="timepicker_default_disabled_color_quantum">@color/bright_foreground_disabled_quantum_dark</color> + <color name="timepicker_default_ampm_selected_background_color_quantum">@color/quantum_light_blue_A200</color> + <color name="timepicker_default_ampm_unselected_background_color_quantum">@color/transparent</color> + <color name="timepicker_default_selector_color_quantum">@color/quantum_light_blue_A200</color> + <color name="timepicker_default_numbers_background_color_quantum">@color/transparent</color> </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6239926..88e1cda 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2274,9 +2274,10 @@ <public type="style" name="ThemeOverlay" /> <public type="style" name="ThemeOverlay.Quantum" /> + <public type="style" name="ThemeOverlay.Quantum.ActionBar" /> <public type="style" name="ThemeOverlay.Quantum.Light" /> <public type="style" name="ThemeOverlay.Quantum.Dark" /> - <public type="style" name="ThemeOverlay.Quantum.ActionBarWidget" /> + <public type="style" name="ThemeOverlay.Quantum.Dark.ActionBar" /> <public type="style" name="Widget.Quantum" /> <public type="style" name="Widget.Quantum.ActionBar" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index a900c1f..241526e 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3780,6 +3780,11 @@ <!-- Description of an application permission that lets it listen to trust state changes. --> <string name="permdesc_trust_listener">Allows an application to listen for changes in trust state.</string> + <!-- Title of an application permission that lets it provide a trust agent. --> + <string name="permlab_provide_trust_agent">Provide a trust agent.</string> + <!-- Description of an application permission that lets it provide a trust agent. --> + <string name="permdesc_provide_trust_agent">Allows an application to provide a trust agent.</string> + <!-- Title of an application permission that lets it bind to a trust agent service. --> <string name="permlab_bind_trust_agent_service">Bind to a trust agent service</string> <!-- Description of an application permission that lets it bind to a trust agent service. --> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index a0b3b63..c769cd9 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1207,6 +1207,7 @@ please see styles_device_defaults.xml. <item name="android:buttonGravity">top</item> <item name="android:navigationButtonStyle">@android:style/Widget.Toolbar.Button.Navigation</item> <item name="android:collapseIcon">?android:attr/homeAsUpIndicator</item> + <item name="android:contentInsetStart">16dp</item> </style> <style name="Widget.Toolbar.Button.Navigation" parent="@android:style/Widget"> diff --git a/core/res/res/values/styles_quantum.xml b/core/res/res/values/styles_quantum.xml index cc8be67..a07d02b 100644 --- a/core/res/res/values/styles_quantum.xml +++ b/core/res/res/values/styles_quantum.xml @@ -739,6 +739,7 @@ please see styles_device_defaults.xml. <item name="itemPadding">8dip</item> <item name="homeLayout">@layout/action_bar_home_quantum</item> <item name="gravity">center_vertical</item> + <item name="contentInsetStart">16dp</item> </style> <style name="Widget.Quantum.ActionBar.Solid"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 9e6588f..41238a3 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1858,10 +1858,6 @@ <java-symbol type="string" name="timepicker_numbers_radius_multiplier_normal" /> <java-symbol type="string" name="timepicker_transition_mid_radius_multiplier" /> <java-symbol type="string" name="timepicker_transition_end_radius_multiplier" /> - <java-symbol type="color" name="timepicker_default_text_color_holo_light" /> - <java-symbol type="color" name="timepicker_default_disabled_color_holo_light" /> - <java-symbol type="color" name="timepicker_default_ampm_unselected_background_color_holo_light" /> - <java-symbol type="color" name="timepicker_default_ampm_selected_background_color_holo_light" /> <java-symbol type="array" name="config_clockTickVibePattern" /> <!-- From various Quantum changes --> @@ -1873,5 +1869,12 @@ <java-symbol type="id" name="icon_frame" /> <java-symbol type="style" name="Animation.VolumePanel" /> <java-symbol type="transition" name="no_transition" /> + <java-symbol type="color" name="timepicker_default_text_color_quantum" /> + <java-symbol type="color" name="timepicker_default_disabled_color_quantum" /> + <java-symbol type="color" name="timepicker_default_ampm_unselected_background_color_quantum" /> + <java-symbol type="color" name="timepicker_default_ampm_selected_background_color_quantum" /> + <java-symbol type="color" name="timepicker_default_selector_color_quantum" /> + <java-symbol type="color" name="timepicker_default_numbers_background_color_quantum" /> + <java-symbol type="style" name="TextAppearance.Quantum.TimePicker.TimeLabel" /> </resources> diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index fb3b57d..eda7174 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -165,6 +165,9 @@ please see themes_device_defaults.xml. <item name="windowActionBarFullscreenDecorLayout">@layout/screen_toolbar</item> <item name="statusBarColor">?attr/colorPrimaryDark</item> <item name="navigationBarColor">@color/black</item> + <item name="windowEnterTransition">@transition/fade</item> + <item name="windowSharedElementEnterTransition">@transition/move</item> + <item name="windowSharedElementExitTransition">@transition/move</item> <!-- Dialog attributes --> <item name="dialogTheme">@style/Theme.Quantum.Dialog</item> @@ -306,8 +309,8 @@ please see themes_device_defaults.xml. <item name="actionBarStyle">@style/Widget.Quantum.ActionBar.Solid</item> <item name="actionBarSize">@dimen/action_bar_default_height_quantum</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item> - <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item> - <item name="actionBarTheme">@null</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBar</item> <item name="actionBarItemBackground">?attr/selectableItemBackgroundBorderless</item> <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item> @@ -652,8 +655,8 @@ please see themes_device_defaults.xml. <item name="actionBarStyle">@style/Widget.Quantum.Light.ActionBar.Solid</item> <item name="actionBarSize">@dimen/action_bar_default_height_quantum</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.Light.PopupWindow.ActionMode</item> - <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item> - <item name="actionBarTheme">@null</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBar</item> <item name="actionBarItemBackground">?attr/selectableItemBackgroundBorderless</item> <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item> @@ -728,8 +731,8 @@ please see themes_device_defaults.xml. with an inverse color profile. The dark action bar sharply stands out against the light content. --> <style name="Theme.Quantum.Light.DarkActionBar"> - <item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item> - <item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark</item> + <item name="actionBarWidgetTheme">@null</item> + <item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark.ActionBar</item> </style> <style name="ThemeOverlay" /> @@ -810,7 +813,14 @@ please see themes_device_defaults.xml. <!-- Theme overlay that replaces the normal control color, which by default is the same as the secondary text color, with the primary text color. --> - <style name="ThemeOverlay.Quantum.ActionBarWidget"> + <style name="ThemeOverlay.Quantum.ActionBar"> + <item name="colorControlNormal">?attr/textColorPrimary</item> + </style> + + <!-- Theme overlay that replaces colors with their dark versions and replaces the normal + control color, which by default is the same as the secondary text color, with the primary + text color. --> + <style name="ThemeOverlay.Quantum.Dark.ActionBar"> <item name="colorControlNormal">?attr/textColorPrimary</item> </style> diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 8cf07fa..55d8d81 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -59,8 +59,8 @@ <string name="keyguard_charged">Charged</string> <!-- When the lock screen is showing and the phone plugged in, and the battery - is not fully charged, show the current charge %. --> - <string name="keyguard_plugged_in">Charging, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> + is not fully charged, say that it's charging. --> + <string name="keyguard_plugged_in">Charging</string> <!-- When the lock screen is showing and the battery is low, warn user to plug in the phone soon. --> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java index e6de72f..a0b5536 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java @@ -475,7 +475,8 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit interpolator, null); // And the forgot pattern button - if (mForgotPatternButton.getVisibility() == View.VISIBLE) { + if (mForgotPatternButton != null + && mForgotPatternButton.getVisibility() == View.VISIBLE) { mAppearAnimationUtils.createAnimation(mForgotPatternButton, delay, duration, startTranslationY, interpolator, null); } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index fef971c..668e1ef 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -418,7 +418,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } } - /* package */ static class BatteryStatus { + public static class BatteryStatus { public final int status; public final int level; public final int plugged; diff --git a/packages/Keyguard/test/SampleTrustAgent/Android.mk b/packages/Keyguard/test/SampleTrustAgent/Android.mk index 7551fdf..2a18ee1 100644 --- a/packages/Keyguard/test/SampleTrustAgent/Android.mk +++ b/packages/Keyguard/test/SampleTrustAgent/Android.mk @@ -20,9 +20,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := SampleTrustAgent -# Remove these to verify permission checks are working correctly -#LOCAL_CERTIFICATE := platform -#LOCAL_PRIVILEGED_MODULE := true +# Remove this to verify permission checks are working correctly +LOCAL_CERTIFICATE := platform LOCAL_MODULE_TAGS := tests diff --git a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml b/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml index 7904927..f3125f1 100644 --- a/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml +++ b/packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml @@ -18,6 +18,7 @@ package="com.android.trustagent.test"> <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/> <uses-permission android:name="android.permission.CONTROL_KEYGUARD" /> + <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" /> <application android:label="@string/app_name"> <service android:name=".SampleTrustAgent" diff --git a/packages/SettingsProvider/res/values-af/defaults.xml b/packages/SettingsProvider/res/values-af/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-af/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-am/defaults.xml b/packages/SettingsProvider/res/values-am/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-am/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ar/defaults.xml b/packages/SettingsProvider/res/values-ar/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-ar/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-bg/defaults.xml b/packages/SettingsProvider/res/values-bg/defaults.xml new file mode 100644 index 0000000..1d546ff --- /dev/null +++ b/packages/SettingsProvider/res/values-bg/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s от %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ca/defaults.xml b/packages/SettingsProvider/res/values-ca/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-ca/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-cs/defaults.xml b/packages/SettingsProvider/res/values-cs/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-cs/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-da/defaults.xml b/packages/SettingsProvider/res/values-da/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-da/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-de/defaults.xml b/packages/SettingsProvider/res/values-de/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-de/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-el/defaults.xml b/packages/SettingsProvider/res/values-el/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-el/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-en-rGB/defaults.xml b/packages/SettingsProvider/res/values-en-rGB/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-en-rGB/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-en-rIN/defaults.xml b/packages/SettingsProvider/res/values-en-rIN/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-en-rIN/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-es-rUS/defaults.xml b/packages/SettingsProvider/res/values-es-rUS/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-es-rUS/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-es/defaults.xml b/packages/SettingsProvider/res/values-es/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-es/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-et-rEE/defaults.xml b/packages/SettingsProvider/res/values-et-rEE/defaults.xml new file mode 100644 index 0000000..5f99ed9 --- /dev/null +++ b/packages/SettingsProvider/res/values-et-rEE/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s, %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-fa/defaults.xml b/packages/SettingsProvider/res/values-fa/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-fa/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-fi/defaults.xml b/packages/SettingsProvider/res/values-fi/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-fi/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-fr-rCA/defaults.xml b/packages/SettingsProvider/res/values-fr-rCA/defaults.xml new file mode 100644 index 0000000..1a04b0f --- /dev/null +++ b/packages/SettingsProvider/res/values-fr-rCA/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s de %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-fr/defaults.xml b/packages/SettingsProvider/res/values-fr/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-fr/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-hi/defaults.xml b/packages/SettingsProvider/res/values-hi/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-hi/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-hr/defaults.xml b/packages/SettingsProvider/res/values-hr/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-hr/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-hu/defaults.xml b/packages/SettingsProvider/res/values-hu/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-hu/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-hy-rAM/defaults.xml b/packages/SettingsProvider/res/values-hy-rAM/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-hy-rAM/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-in/defaults.xml b/packages/SettingsProvider/res/values-in/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-in/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-it/defaults.xml b/packages/SettingsProvider/res/values-it/defaults.xml new file mode 100644 index 0000000..bc995b0 --- /dev/null +++ b/packages/SettingsProvider/res/values-it/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-iw/defaults.xml b/packages/SettingsProvider/res/values-iw/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-iw/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ja/defaults.xml b/packages/SettingsProvider/res/values-ja/defaults.xml new file mode 100644 index 0000000..bc995b0 --- /dev/null +++ b/packages/SettingsProvider/res/values-ja/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-ka-rGE/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-ka-rGE/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-km-rKH/defaults.xml b/packages/SettingsProvider/res/values-km-rKH/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-km-rKH/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ko/defaults.xml b/packages/SettingsProvider/res/values-ko/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-ko/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-lt/defaults.xml b/packages/SettingsProvider/res/values-lt/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-lt/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-lv/defaults.xml b/packages/SettingsProvider/res/values-lv/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-lv/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-nb/defaults.xml b/packages/SettingsProvider/res/values-nb/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-nb/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-nl/defaults.xml b/packages/SettingsProvider/res/values-nl/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-nl/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-pl/defaults.xml b/packages/SettingsProvider/res/values-pl/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-pl/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-pt-rPT/defaults.xml b/packages/SettingsProvider/res/values-pt-rPT/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-pt-rPT/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-pt/defaults.xml b/packages/SettingsProvider/res/values-pt/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-pt/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ro/defaults.xml b/packages/SettingsProvider/res/values-ro/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-ro/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-ru/defaults.xml b/packages/SettingsProvider/res/values-ru/defaults.xml new file mode 100644 index 0000000..bc995b0 --- /dev/null +++ b/packages/SettingsProvider/res/values-ru/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-sk/defaults.xml b/packages/SettingsProvider/res/values-sk/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-sk/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-sl/defaults.xml b/packages/SettingsProvider/res/values-sl/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-sl/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-sr/defaults.xml b/packages/SettingsProvider/res/values-sr/defaults.xml new file mode 100644 index 0000000..bc995b0 --- /dev/null +++ b/packages/SettingsProvider/res/values-sr/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-sv/defaults.xml b/packages/SettingsProvider/res/values-sv/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-sv/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-sw/defaults.xml b/packages/SettingsProvider/res/values-sw/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-sw/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-th/defaults.xml b/packages/SettingsProvider/res/values-th/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-th/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-tl/defaults.xml b/packages/SettingsProvider/res/values-tl/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-tl/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-tr/defaults.xml b/packages/SettingsProvider/res/values-tr/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-tr/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-uk/defaults.xml b/packages/SettingsProvider/res/values-uk/defaults.xml new file mode 100644 index 0000000..8ca4583 --- /dev/null +++ b/packages/SettingsProvider/res/values-uk/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%2$s о %1$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-vi/defaults.xml b/packages/SettingsProvider/res/values-vi/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-vi/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-zh-rHK/defaults.xml b/packages/SettingsProvider/res/values-zh-rHK/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-zh-rHK/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-zh-rTW/defaults.xml b/packages/SettingsProvider/res/values-zh-rTW/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-zh-rTW/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-zu/defaults.xml b/packages/SettingsProvider/res/values-zu/defaults.xml new file mode 100644 index 0000000..295b4f5 --- /dev/null +++ b/packages/SettingsProvider/res/values-zu/defaults.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> +</resources> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_06.xml b/packages/SystemUI/res/drawable/ic_qs_location_06.xml index 25c9ae5..5642a8a 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_06.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_06.xml @@ -27,7 +27,5 @@ Copyright (C) 2014 The Android Open Source Project android:pathData="M12.0,16.0c-1.16,0.0 -2.1,0.94 -2.1,2.1C9.9,19.67 12.0,22.0 12.0,22.0s2.1,-2.33 2.1,-3.9C14.1,16.94 13.16,16.0 12.0,16.0zM12.0,18.85c-0.41,0.0 -0.75,-0.34 -0.75,-0.75s0.34,-0.75 0.75,-0.75c0.41,0.0 0.75,0.34 0.75,0.75S12.41,18.85 12.0,18.85z"/> <path android:pathData="M11.99,15c-1.35,0,-2.45,1.1,-2.45,2.45 c0,1.84,2.45,4.55,2.45,4.55s2.45,-2.71,2.45,-4.55C14.44,16.1,13.34,15,11.99,15z M11.99,18.33c-0.48,0,-0.88,-0.39,-0.88,-0.88 s0.39,-0.88,0.88,-0.88c0.48,0,0.87,0.39,0.87,0.88S12.47,18.33,11.99,18.33z" - android:strokeWidth=".35" - android:fill="#00000000" - android:stroke="#CCCCCC"/> + android:fill="#4DFFFFFF"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_07.xml b/packages/SystemUI/res/drawable/ic_qs_location_07.xml index a69c3a2..1ad2ebc 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_07.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_07.xml @@ -24,7 +24,5 @@ Copyright (C) 2014 The Android Open Source Project <path android:pathData="M12,9c-2.51,0,-4.55,2.04,-4.55,4.55 C7.45,16.96,12,22,12,22s4.55,-5.04,4.55,-8.45C16.55,11.04,14.51,9,12,9z M12,15.18c-0.9,0,-1.63,-0.73,-1.63,-1.62 s0.73,-1.62,1.63,-1.62c0.9,0,1.62,0.73,1.62,1.62S12.9,15.18,12,15.18z" - android:strokeWidth="0.65" - android:fill="#00000000" - android:stroke="#CCCCCC"/> + android:fill="#4DFFFFFF"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_08.xml b/packages/SystemUI/res/drawable/ic_qs_location_08.xml index c89c047..179bc66 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_08.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_08.xml @@ -24,7 +24,5 @@ Copyright (C) 2014 The Android Open Source Project <path android:pathData="M12,6c-3.09,0,-5.6,2.51,-5.6,5.6 C6.4,15.8,12,22,12,22s5.6,-6.2,5.6,-10.4C17.6,8.51,15.09,6,12,6z M12,13.6c-1.1,0,-2,-0.9,-2,-2s0.9,-2,2,-2c1.1,0,2,0.9,2,2 S13.1,13.6,12,13.6z" - android:strokeWidth="0.8" - android:fill="#00000000" - android:stroke="#CCCCCC"/> + android:fill="#4DFFFFFF"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_09.xml b/packages/SystemUI/res/drawable/ic_qs_location_09.xml index 96bb6ce..6169af5 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_09.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_09.xml @@ -24,7 +24,5 @@ Copyright (C) 2014 The Android Open Source Project <path android:pathData="M12,4c-3.48,0,-6.3,2.82,-6.3,6.3 C5.7,15.02,12,22,12,22s6.3,-6.98,6.3,-11.7C18.3,6.82,15.48,4,12,4z M12,12.55c-1.24,0,-2.25,-1.01,-2.25,-2.25S10.76,8.05,12,8.05 c1.24,0,2.25,1.01,2.25,2.25S13.24,12.55,12,12.55z" - android:strokeWidth="0.9" - android:fill="#00000000" - android:stroke="#CCCCCC"/> + android:fill="#4DFFFFFF"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_10.xml b/packages/SystemUI/res/drawable/ic_qs_location_10.xml index aced4bd..93e2eb4 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_10.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_10.xml @@ -24,7 +24,5 @@ Copyright (C) 2014 The Android Open Source Project <path android:pathData="M12,3C8.33,3,5.35,5.98,5.35,9.65 C5.35,14.64,12,22,12,22s6.65,-7.36,6.65,-12.35C18.65,5.98,15.67,3,12,3z M12,12.02c-1.31,0,-2.38,-1.06,-2.38,-2.38 S10.69,7.28,12,7.28c1.31,0,2.37,1.06,2.37,2.37S13.31,12.02,12,12.02z" - android:strokeWidth="0.95" - android:fill="#00000000" - android:stroke="#CCCCCC"/> + android:fill="#4DFFFFFF"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_qs_location_11.xml b/packages/SystemUI/res/drawable/ic_qs_location_11.xml index 578308e..09a3e63 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location_11.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_11.xml @@ -24,7 +24,5 @@ Copyright (C) 2014 The Android Open Source Project <path android:pathData="M12,2C8.13,2,5,5.13,5,9c0,5.25,7,13,7,13s7,-7.75,7,-13 C19,5.13,15.87,2,12,2z M12,11.5c-1.38,0,-2.5,-1.12,-2.5,-2.5s1.12,-2.5,2.5,-2.5c1.38,0,2.5,1.12,2.5,2.5S13.38,11.5,12,11.5z" - android:fill="#00000000" - android:stroke="#CCCCCC" - android:strokeWidth="1.0"/> + android:fill="#4DFFFFFF"/> </vector> diff --git a/packages/SystemUI/res/drawable/keyguard_overflow_number_background.xml b/packages/SystemUI/res/drawable/keyguard_overflow_number_background.xml new file mode 100644 index 0000000..b812d43 --- /dev/null +++ b/packages/SystemUI/res/drawable/keyguard_overflow_number_background.xml @@ -0,0 +1,21 @@ +<?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="oval"> + <solid android:color="#1a000000" /> +</shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml index f867068..c442f79 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml @@ -32,20 +32,20 @@ /> <TextView android:id="@+id/more_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_marginStart="20dp" android:layout_gravity="center_vertical" - android:gravity="center_horizontal" - android:textColor="@color/keyguard_overflow_content_color" - android:textAllCaps="true" - android:textAppearance="?android:attr/textAppearanceMedium" + android:background="@drawable/keyguard_overflow_number_background" + android:gravity="center" + android:textColor="#ff686868" + android:textStyle="bold" + android:textSize="14dp" /> <com.android.systemui.statusbar.NotificationOverflowIconsView android:id="@+id/overflow_icons_view" - android:layout_gravity="end|center_vertical" - android:gravity="end" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:layout_gravity="center_vertical" + android:layout_marginStart="68dp" android:layout_width="120dp" android:layout_height="wrap_content" /> diff --git a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml index ff8800c..84d64b9 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml @@ -28,7 +28,7 @@ android:layout_height="@dimen/speed_bump_height_collapsed" android:layout_gravity="top" android:orientation="horizontal"> - <View + <com.android.systemui.statusbar.AlphaOptimizedView android:id="@+id/speedbump_line_left" android:layout_width="0dp" android:layout_height="1dp" @@ -42,7 +42,7 @@ android:layout_marginEnd="8dp" android:layout_height="match_parent" android:layout_weight="0"/> - <View + <com.android.systemui.statusbar.AlphaOptimizedView android:id="@+id/speedbump_line_right" android:layout_width="0dp" android:layout_height="1dp" diff --git a/packages/SystemUI/res/layout/volume_panel_item.xml b/packages/SystemUI/res/layout/volume_panel_item.xml index 4a2a0c0..6e5ab47 100644 --- a/packages/SystemUI/res/layout/volume_panel_item.xml +++ b/packages/SystemUI/res/layout/volume_panel_item.xml @@ -35,7 +35,6 @@ android:layout_height="wrap_content" android:layout_weight="1"> <SeekBar - style="?android:attr/seekBarStyle" android:id="@+id/seekbar" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index e43464c..c642626 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Aan."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Af"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Gekoppel."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Ligging <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Wekker gestel vir <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G-data gedeaktiveer"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G data gedeaktiveer"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobieldata gedeaktiveer"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Meer instellings"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"USB-verbinding"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Warmkol"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ONLANGS"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Kennisgewings"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Geen onlangse programme nie"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Programinligting"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"soek"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Netwerk word\ndalk gemonitor"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Sleep op om te ontsluit"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Totdat jy dit afskakel"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Een minuut lank"</item> + <item quantity="other" msgid="6924190729213550991">"%d minute lank"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Een uur lank"</item> + <item quantity="other" msgid="5408537517529822157">"%d uur lank"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index ce3d14b..d864f9f 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"በርቷል።"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"ጠፍቷል።"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"ተገናኝቷል።"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"ብሉቱዝ <xliff:g id="STATE">%s</xliff:g>።"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"አካባቢ <xliff:g id="STATE">%s</xliff:g>።"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"ማንቂያ ለ<xliff:g id="TIME">%s</xliff:g> ተዋቅሯል።"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G ውሂብ ቦዝኗል"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G ውሂብ ቦዝኗል"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"የተንቀሳቃሽ ውሂብ ቦዝኗል"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"ተጨማሪ ቅንብሮች"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"በማገናኘት ላይ"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"መገናኛ ነጥብ"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"የቅርብ ጊዜዎች"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ማሳወቂያዎች"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"ምንም የቅርብ ጊዜ መተግበሪያዎች የሉም"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"የመተግበሪያ መረጃ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ፈልግ"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"አውታረ መረብ\nክትትል ሊደረግበት ይችላል"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"ይህን እስኪያጠፉት ድረስ"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"ለአንድ ደቂቃ"</item> + <item quantity="other" msgid="6924190729213550991">"ለ%d ደቂቃዎች"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"ለአንድ ሰዓት"</item> + <item quantity="other" msgid="5408537517529822157">"ለ%d ሰዓቶች"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index c9ddc23..3906bfa 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"تم التشغيل."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"تم الإيقاف."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"متصل."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"البلوتوث <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"حالة الموقع: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"تم ضبط المنبه على <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"تم تعطيل بيانات شبكات الجيل الثاني والجيل الثالث"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"تم تعطيل بيانات شبكة الجيل الرابع"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"تم تعطيل بيانات الجوال"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"المزيد من الإعدادات"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"النطاق"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"نقطة اتصال"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"الأخيرة"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"الإشعارات"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"ليست هناك تطبيقات حديثة"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"معلومات التطبيق"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"بحث"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"قد تكون الشبكة\nخاضعة للرقابة"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"لحين تعطيل هذا الإعداد"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"لمدة دقيقة واحدة"</item> + <item quantity="other" msgid="6924190729213550991">"لمدة %d من الدقائق"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"لمدة ساعة واحدة"</item> + <item quantity="other" msgid="5408537517529822157">"لمدة %d من الساعات"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index d396b8c..6ef23ad 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Вкл."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Изкл."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Има връзка."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Местоположението е <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Будилникът е навит за <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G данните са деактивирани"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G данните са деактивирани"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Мобилните данни са деактивирани"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Още настройки"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Тетъринг"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Точка за достъп"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"СКОРОШНИ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Известия"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Няма скорошни приложения"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Информация за приложението"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"търсене"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Мрежата може\nда се наблюдава"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Докато не изключите това"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"За една минута"</item> + <item quantity="other" msgid="6924190729213550991">"За %d минути"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"За един час"</item> + <item quantity="other" msgid="5408537517529822157">"За %d часа"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 51790b5..9e3495e 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Activat."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Desactivat."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connectat."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Ubicació: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarma establerta a les <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Dades 2G-3G desactivades"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Dades 4G desactivades"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Dades mòbils desactivades"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Més opcions"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Ancoratge a xarxa"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Zona Wi-Fi"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTS"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificacions"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"No hi ha aplicacions recents."</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informació de l\'aplicació"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"És possible que la xarxa\nestigui controlada"</string> @@ -228,4 +234,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Fes lliscar el dit cap amunt per desbloquejar el teclat."</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Fins que no ho desactivis"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Durant un minut"</item> + <item quantity="other" msgid="6924190729213550991">"Durant %d minuts"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Durant una hora"</item> + <item quantity="other" msgid="5408537517529822157">"Durant %d hores"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 91b8f6e..6050da4 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Zapnuto."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Vypnuto."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Připojeno."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Poloha: <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Budík je nastaven na <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Datové přenosy 2G a 3G jsou zakázány"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Datové přenosy 4G jsou zakázány"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobilní data jsou zakázána"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Další nastavení"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Sdílení datového připojení"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"POSLEDNÍ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Oznámení"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Žádné nedávné aplikace"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informace o aplikaci"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"vyhledat"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Síť může být\nmonitorována"</string> @@ -228,4 +234,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Zařízení odemknete přejetím prstem nahoru"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Dokud tuto funkci nevypnete"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Na jednu minutu"</item> + <item quantity="other" msgid="6924190729213550991">"Na %d min"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Na jednu hodinu"</item> + <item quantity="other" msgid="5408537517529822157">"Na %d h"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 1d1ca0a..830bebf 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Til."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Fra."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Forbundet."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Placering <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarmen er indstillet til <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G-data er deaktiveret"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G-data er deaktiveret"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobildata er deaktiveret"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Flere indstillinger"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Netdeling"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"SENESTE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Underretninger"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Der er ingen seneste apps"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Oplysninger om applikationen"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"søg"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Netværket kan\nvære overvåget"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Stryg for at låse op"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Indtil du slår denne indstilling fra"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"I ét minut"</item> + <item quantity="other" msgid="6924190729213550991">"I %d minutter"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"I én time"</item> + <item quantity="other" msgid="5408537517529822157">"I %d timer"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index a79193d..72c9d64 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"An"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Aus"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Verbunden"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Standort <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Wecker gestellt für <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-/3G-Daten deaktiviert"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G-Daten deaktiviert"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobilfunk Daten deaktiviert"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Weitere Einstellungen"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"Letzte"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Benachrichtigungen"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Keine neuen Apps"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"App-Info"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"Suche"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Netzwerk wird\neventuell überwacht."</string> @@ -228,4 +234,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Zum Entsperren nach oben wischen"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Bis zur Deaktivierung"</string> + <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> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Für eine Stunde"</item> + <item quantity="other" msgid="5408537517529822157">"Für %d Stunden"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 32b7090..2d3f246 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Ενεργό."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Ανενεργό."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Έχει συνδεθεί."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Τοποθεσία <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Το ξυπνητήρι έχει οριστεί στις <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Τα δεδομένα 2G-3G απενεργοποιήθηκαν"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Τα δεδομένα 4G απενεργοποιήθηκαν"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Τα δεδομένα κινητής τηλεφωνίας απενεργοποιήθηκαν"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Περισσότερες ρυθμίσεις"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Πρόσδεση"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Σημείο πρόσβασης Wi-Fi"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ΠΡΟΣΦΑΤΑ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Ειδοποιήσεις"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Καμία πρόσφατη εφαρμογή"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Πληροφορίες εφαρμογής"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"αναζήτηση"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Το δίκτυο μπορεί\nνα παρακολουθείται"</string> @@ -228,4 +234,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Μέχρι να το απενεργοποιήσετε"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Για ένα λεπτό"</item> + <item quantity="other" msgid="6924190729213550991">"Για %d λεπτά"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Για μία ώρα"</item> + <item quantity="other" msgid="5408537517529822157">"Για %d ώρες"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index d26cfae..66233cc 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"On."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Off."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connected."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Location <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G data disabled"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G data disabled"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobile data disabled"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"More settings"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTS"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"No recent apps"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Network may\nbe monitored"</string> @@ -226,4 +232,13 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"Less urgent notifications below"</string> <string name="notification_tap_again" msgid="7590196980943943842">"Tap again to open"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"Swipe up to unlock"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Until you turn this off"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"For one minute"</item> + <item quantity="other" msgid="6924190729213550991">"For %d minutes"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"For one hour"</item> + <item quantity="other" msgid="5408537517529822157">"For %d hours"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index d48e627..66233cc 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"On."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Off."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connected."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Location <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G data disabled"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G data disabled"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobile data disabled"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"More settings"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTS"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"No recent apps"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Network may\nbe monitored"</string> @@ -223,8 +229,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d more"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <string name="speed_bump_explanation" msgid="1288875699658819755">"Less urgent notifications below"</string> <string name="notification_tap_again" msgid="7590196980943943842">"Tap again to open"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"Swipe up to unlock"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Until you turn this off"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"For one minute"</item> + <item quantity="other" msgid="6924190729213550991">"For %d minutes"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"For one hour"</item> + <item quantity="other" msgid="5408537517529822157">"For %d hours"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 23bcea2..0810ee7 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Activado"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Desactivado"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Conectado"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Ubicación <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarma: <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Datos de 2G-3G inhabilitados"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Datos de 4G inhabilitados"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Se inhabilitaron los datos móviles"</string> @@ -209,7 +214,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Más configuraciones"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Anclaje a red"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Zona"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECIENTES"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificaciones"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Es posible que la red\nesté supervisada."</string> @@ -225,8 +232,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d más"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Deslizar el dedo hacia arriba para desbloquear"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Hasta que lo desactives"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Durante un minuto"</item> + <item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Durante una hora"</item> + <item quantity="other" msgid="5408537517529822157">"Durante %d horas"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 3bded8b..ad92c24 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Sí"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"No"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Conectado"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Ubicación <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"La alarma sonará a la(s) <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Datos 2G-3G inhabilitados"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Datos 4G inhabilitados"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Datos móviles inhabilitados"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Más opciones"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Anclaje a red"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Zona Wi-Fi"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECIENTES"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificaciones"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"No hay aplicaciones recientes"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"La red se\npuede supervisar"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Desliza el dedo hacia arriba para desbloquear"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Hasta apagar el dispositivo"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Durante un minuto"</item> + <item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Durante una hora"</item> + <item quantity="other" msgid="5408537517529822157">"Durante %d horas"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index 1979c55..71e2af6 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Sees."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Väljas."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Ühendatud."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Asukoht: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Määratud äratus: <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G–3G andmeside keelatud"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G andmeside keelatud"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobiilne andmeside keelatud"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Rohkem seadeid"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Jagamine"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Leviala"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"HILJUTISED"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Märguanded"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Hiljutisi rakendusi pole"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Rakenduste teave"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"otsing"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Võrku võidakse\njälgida"</string> @@ -224,4 +230,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Lukustuse tühistamiseks pühkige üles"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Kuni lülitate selle välja"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Üheks minutiks"</item> + <item quantity="other" msgid="6924190729213550991">"%d minutiks"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Üheks tunniks"</item> + <item quantity="other" msgid="5408537517529822157">"%d tunniks"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 399740a..3ea2110 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"روشن."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"خاموش."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"متصل."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"بلوتوث <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"مکان <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"هشدار برای <xliff:g id="TIME">%s</xliff:g> تنظیم شد."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"داده 2G-3G غیرفعال شد"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"داده 4G غیر فعال شد"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"دادههای تلفن همراه غیرفعال است"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"تنظیمات بیشتر"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"اتصال به اینترنت با تلفن همراه"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"نقطه اتصال"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"موارد اخیر"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"اعلانها"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"هیچ برنامه جدیدی موجود نیست"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"اطلاعات برنامه"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"جستجو"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"ممکن است شبکه\nتحت نظارت باشد"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"تا وقتی آن را خاموش کنید"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"برای یک دقیقه"</item> + <item quantity="other" msgid="6924190729213550991">"برای %d دقیقه"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"برای یک ساعت"</item> + <item quantity="other" msgid="5408537517529822157">"برای %d ساعت"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index be7eb9b..eb68ea6 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Käytössä."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Pois käytöstä."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Yhdistetty."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Sijainti <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Hälytys asetettu, aika: <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G-tiedonsiirto pois käytöstä"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G-tiedonsiirto pois käytöstä"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobiilitiedonsiirto pois käytöstä"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Lisäasetukset"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Jaettu yhteys"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"VIIMEISIMMÄT"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Ilmoitukset"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Sovellustiedot"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"haku"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Verkkoa saatetaan\nvalvoa"</string> @@ -226,4 +233,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Avaa lukitus pyyhkäisemällä ylös"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Kunnes poistat tämän käytöstä"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Minuutiksi"</item> + <item quantity="other" msgid="6924190729213550991">"%d minuutiksi"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Tunniksi"</item> + <item quantity="other" msgid="5408537517529822157">"%d tunniksi"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 390ec81..4c1df8c 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Activé"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Désactivé"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connecté"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1x"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"3G+"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth : <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Localisation <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarme réglée sur <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Données 2G-3G désactivées"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Données 4G désactivées"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Données mobiles désactivées"</string> @@ -209,7 +214,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Plus de paramètres"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Partage de connexion"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Point d\'accès sans fil"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RÉCENTS"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Détails de l\'application"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Le réseau peut\nêtre surveillé."</string> @@ -228,4 +235,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Glissez vers le haut pour déverrouiller"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Jusqu\'à la désactivation"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Pendant une minute"</item> + <item quantity="other" msgid="6924190729213550991">"Pendant %d minutes"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Pendant une heure"</item> + <item quantity="other" msgid="5408537517529822157">"Pendant %d heures"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index a0c5cfe..bd709a0 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Activé"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Désactivé"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connecté"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1x"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth : <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Localisation <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarme réglée sur <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Données 2G-3G désactivées"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Données 4G désactivées"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Données mobiles désactivées"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Plus de paramètres"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Partage de connexion"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Point d\'accès"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RÉCENTS"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Aucune application récente"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informations sur l\'application"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Le réseau peut\nêtre surveillé."</string> @@ -228,4 +234,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Faire glisser pour déverrouiller"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Jusqu\'à la désactivation"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Pendant une minute"</item> + <item quantity="other" msgid="6924190729213550991">"Pendant %d minutes"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Pendant une heure"</item> + <item quantity="other" msgid="5408537517529822157">"Pendant %d heures"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 6850b3d..d6b6d6a 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"चालू."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"बंद."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"कनेक्ट है."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"स्थान <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"<xliff:g id="TIME">%s</xliff:g> के लिए अलार्म सेट किया गया."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G डेटा अक्षम"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G डेटा अक्षम"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"मोबाइल डेटा अक्षम"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"और सेटिंग"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"टेदरिंग"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"हॉटस्पॉट"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"हाल ही का"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"सूचनाएं"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"कोई हाल ही का ऐप्स नहीं"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"एप्लिकेशन जानकारी"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"खोज"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"नेटवर्क को\nमॉनीटर किया जा सकता है"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"जब तक आप इसे बंद नहीं कर देते"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"एक मिनट के लिए"</item> + <item quantity="other" msgid="6924190729213550991">"%d मिनट के लिए"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"एक घंटे के लिए"</item> + <item quantity="other" msgid="5408537517529822157">"%d घंटे के लिए"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index b00c382..79d7003 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Uključeno."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Isključeno."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Povezano."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth – <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Lokacija <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Vrijeme alarma: <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Onemogućeni su 2G-3G podaci"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Onemogućeni su 4G podaci"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Onemogućeni su mobilni podaci"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Više postavki"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Dijeljenje veze"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Žarišna točka"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"NEDAVNO"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Obavijesti"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Nema nedavnih aplikacija"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Mreža se\nmožda prati"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Prijeđite prstom prema gore za otključavanje"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Dok ne isključite"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Jednu minutu"</item> + <item quantity="other" msgid="6924190729213550991">"%d min"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Jedan sat"</item> + <item quantity="other" msgid="5408537517529822157">"%d h"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index b75c7f3..915f5eb 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Bekapcsolva."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Kikapcsolva."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Csatlakoztatva."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Helyadatok: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Ébresztés időpontja: <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G adatforgalom letiltva"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G adatforgalom letiltva"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobil adatforgalom letiltva"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"További beállítások"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Megosztás"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"LEGUTÓBBIAK"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Értesítések"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Nincs újabb alkalmazás"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Az alkalmazás adatai"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"keresés"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Lehet, hogy a\nhálózat felügyelt"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Húzza felfelé az ujját a feloldáshoz"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Amíg ki nem kapcsolja ezt"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Egy percen át"</item> + <item quantity="other" msgid="6924190729213550991">"%d percen át"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Egy órán át"</item> + <item quantity="other" msgid="5408537517529822157">"%d órán át"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index 904b998..ca327d8 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Միացված է:"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Անջատված է:"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Միացված է:"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth-ը <xliff:g id="STATE">%s</xliff:g> է:"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Տեղադրությունը՝ <xliff:g id="STATE">%s</xliff:g>:"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Զարթուցիչը դրված է <xliff:g id="TIME">%s</xliff:g>-ին:"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G տվյալները անջատված են"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G տվյալները անջատված են"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Շարժական տվյալները անջատված են"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Հավելյալ կարգավորումներ"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Միացում"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Թեժ կետ"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ՎԵՐՋԻՆՆԵՐԸ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Ծանուցումներ"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Հավելվածի մասին"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"որոնել"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Ցանցը կարող է\nվերահսկվել"</string> @@ -226,4 +233,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Քանի դեռ չեք անջատել"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Մեկ րոպե"</item> + <item quantity="other" msgid="6924190729213550991">"%d րոպե"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Մեկ ժամ"</item> + <item quantity="other" msgid="5408537517529822157">"%d ժամ"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 02313b3..48c9a6d 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Aktif."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Nonaktif."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Tersambung."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Lokasi <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm disetel ke <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Data 2G-3G dinonaktifkan"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Data 4G dinonaktifkan"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Data seluler dinonaktifkan"</string> @@ -202,16 +207,13 @@ <string name="quick_settings_remote_display_no_connection_label" msgid="372107699274391290">"Layar Transmisi"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Kecerahan"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"OTOMATIS"</string> - <!-- no translation found for quick_settings_inversion_label (8790919884718619648) --> - <skip /> + <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Inversi warna"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"Mode koreksi warna"</string> - <!-- no translation found for quick_settings_more_settings (326112621462813682) --> - <skip /> - <!-- no translation found for quick_settings_tethering_label (7153452060448575549) --> - <skip /> - <!-- no translation found for quick_settings_hotspot_label (6046917934974004879) --> - <skip /> - <string name="recents_empty_message" msgid="2269156590813544104">"TERBARU"</string> + <string name="quick_settings_more_settings" msgid="326112621462813682">"Setelan lainnya"</string> + <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Menambatkan"</string> + <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Pemberitahuan"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Tidak ada aplikasi terkini"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Info Aplikasi"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"telusuri"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Jaringan bisa\ndiawasi"</string> @@ -227,8 +229,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d lainnya"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Gesek ke atas untuk membuka kunci"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Hingga Anda menonaktifkan ini"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Selama satu menit"</item> + <item quantity="other" msgid="6924190729213550991">"Selama %d menit"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Selama satu jam"</item> + <item quantity="other" msgid="5408537517529822157">"Selama %d jam"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 412d001..8653c8f 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"ON"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"OFF"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connesso."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Posizione: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Allarme impostato per: <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Dati 2G-3G disattivati"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Dati 4G disattivati"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Dati mobili disattivati"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Altre impostazioni"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"MESSAGGI RECENTI"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifiche"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Nessuna app recente"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informazioni sull\'applicazione"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"La rete potrebbe\nessere monitorata"</string> @@ -228,4 +234,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Scorri verso l\'alto per sbloccare"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Fino alla disattivazione"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Per un minuto"</item> + <item quantity="other" msgid="6924190729213550991">"Per %d minuti"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Per un\'ora"</item> + <item quantity="other" msgid="5408537517529822157">"Per %d ore"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 33a6701..3279bc1 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"פועל."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"כבוי."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"מחובר."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"המיקום <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"ההתראה נקבעה ל-<xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"נתוני 2G-3G מושבתים"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"נתוני 4G מושבתים"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"נתונים לנייד מושבתים"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"הגדרות נוספות"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"שיתוף אינטרנט בין ניידים"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"נקודה לשיתוף אינטרנט"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"אחרונים"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"הודעות"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"אין אפליקציות אחרונות"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"מידע על האפליקציה"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"חפש"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"ייתכן שהרשת\nמנוטרת"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"עד שתכבה"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"למשך דקה אחת"</item> + <item quantity="other" msgid="6924190729213550991">"למשך %d דקות"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"למשך שעה אחת"</item> + <item quantity="other" msgid="5408537517529822157">"למשך %d שעות"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 3ed729b..a1f7b5e 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"ON"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"OFF"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"接続済みです。"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"現在地: <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"アラームは<xliff:g id="TIME">%s</xliff:g>に設定されています。"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G～3Gデータが無効になりました"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4Gデータが無効になりました"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"モバイルデータが無効になりました"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"詳細設定"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"テザリング"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"アクセスポイント"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"最近"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"最近使ったアプリはありません"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"アプリ情報"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"検索"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"ネットワークが監視される\n場合があります"</string> @@ -228,4 +234,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"ユーザーがOFFにするまで"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1分"</item> + <item quantity="other" msgid="6924190729213550991">"%d分"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1時間"</item> + <item quantity="other" msgid="5408537517529822157">"%d時間"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 506ec3d..a1862da 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"ჩართული"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"გამორთულია."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"დაკავშირებულია."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"მდებარეობა <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"მაღვიძარა დაყენებულია: <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G ინტერნეტი გაითიშა."</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G მონაცემები გათიშულია"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"მობილური ინტერნეტი გაითიშა."</string> @@ -202,12 +207,14 @@ <string name="quick_settings_remote_display_no_connection_label" msgid="372107699274391290">"Cast Screen"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"განათება"</string> <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_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_tethering_label" msgid="7153452060448575549">"მოდემის რეჟიმი"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"წვდომის წერტილი"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ბოლო დროის"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"შეტყობინებები"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"აპლიკაციის შესახებ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ძიება"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"შესაძლოა ქსელზე\nმონიტორინგი ხორციელდებოდეს"</string> @@ -223,8 +230,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d სხვა"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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="zen_mode_forever" msgid="7420011936770086993">"სანამ ამას გამორთავდეთ"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"ერთი წუთით"</item> + <item quantity="other" msgid="6924190729213550991">"%d წუთით"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"ერთი საათით"</item> + <item quantity="other" msgid="5408537517529822157">"%d საათით"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index f3b4e9e..3f5b844 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"បើក។"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"បិទ"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"បានតភ្ជាប់។"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"ប៊្លូធូស <xliff:g id="STATE">%s</xliff:g> ។"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"ទីតាំង <xliff:g id="STATE">%s</xliff:g> ។"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"កំណត់សំឡេងរោទ៍សម្រាប់ <xliff:g id="TIME">%s</xliff:g> ។"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"បានបិទទិន្នន័យ 2G-3G"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"បានបិទទិន្នន័យ 4G"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"បានបិទទិន្នន័យចល័ត"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"ការកំណត់ច្រើនទៀត"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"ការភ្ជាប់"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"ហតស្ប៉ត"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ថ្មីៗ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ការជូនដំណឹង"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ព័ត៌មានកម្មវិធី"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ស្វែងរក"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"បណ្ដាញអាច\nត្រូវបានត្រួតពិនិត្យ"</string> @@ -226,4 +233,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"រហូតដល់ពេលអ្នកបិទវា"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"សម្រាប់មួយនាទី"</item> + <item quantity="other" msgid="6924190729213550991">"សម្រាប់ %d នាទី"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"សម្រាប់មួយម៉ោង"</item> + <item quantity="other" msgid="5408537517529822157">"សម្រាប់ %d ម៉ោង"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 2b39e14..4772e54 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"사용"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"사용 안함"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"연결됨"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"블루투스 <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"위치 <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"알람이 <xliff:g id="TIME">%s</xliff:g>(으)로 설정되었습니다."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G 데이터 사용중지됨"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G 데이터 사용중지됨"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"모바일 데이터 사용중지됨"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"설정 더보기"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"테더링"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"핫스팟"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"최근"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"알림"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"최근에 사용한 앱 없음"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"애플리케이션 정보"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"검색"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"네트워크가\n모니터링될 수 있음"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"이 기능을 사용 중지할 때까지"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1분 동안"</item> + <item quantity="other" msgid="6924190729213550991">"%d분 동안"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1시간 동안"</item> + <item quantity="other" msgid="5408537517529822157">"%d시간 동안"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index 5d2ccbc..d5117a9 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"ເປີດ."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"ປິດ."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"ເຊື່ອມຕໍ່ແລ້ວ."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"ສະຖານທີ່ <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"ຕັ້ງໂມງປຸກ <xliff:g id="TIME">%s</xliff:g> ແລ້ວ."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"ອິນເຕີເນັດ 2G, 3G ຖືກປິດແລ້ວ"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"ການນຳໃຊ້ຂໍ້ມູນ 4G ຖືກປິດແລ້ວ"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"ອິນເຕີເນັດໃນມືຖືຖືກປິດການນຳໃຊ້ແລ້ວ"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"ການຕັ້ງຄ່າເພີ່ມເຕີມ"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"ການປ່ອນສັນຍານ"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"ຮັອດສະປອດ"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ບໍ່ດົນມານີ້"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ການແຈ້ງເຕືອນ"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"ບໍ່ມີແອັບຯທີ່ຫາກໍໃຊ້"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ຂໍ້ມູນແອັບພລິເຄຊັນ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ຊອກຫາ"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"ເຄືອຄ່າຍອາດ\nຖືກຕິດຕາມ"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"ຈົນກວ່າທ່ານຈະປິດ"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"ເປັນເວລານຶ່ງນາທີ"</item> + <item quantity="other" msgid="6924190729213550991">"ເປັນເວລາ %d ນາທີ"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"ເປັນເວລານຶ່ງຊົ່ວໂມງ"</item> + <item quantity="other" msgid="5408537517529822157">"ເປັນເວລາ %d ຊົ່ວໂມງ"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index cede14c..574e559 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Įjungta."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Išjungta."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Prijungta."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"„Bluetooth“ <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Vietovė – <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Signalas nustatytas <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G–3G duomenys neleidžiami"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G duomenys neleidžiami"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobilieji duomenys neleidžiami"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Daugiau nustatymų"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Susiejimas"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Viešosios interneto prieigos taškas"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"PASTARIEJI"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Pranešimai"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Nėra naujausių programų"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Programos informacija"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"paieška"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Tinklas gali\nbūti stebimas"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Perbraukite aukštyn, kad atrakintumėte"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Kol išjungsite"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1 min."</item> + <item quantity="other" msgid="6924190729213550991">"%d min."</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1 val."</item> + <item quantity="other" msgid="5408537517529822157">"%d val."</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 280ce40..398553d 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Ieslēgts"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Izslēgts"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Savienojums ir izveidots."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth statuss: <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Atrašanās vieta: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Signāls ir iestatīts uz: <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G–3G dati atspējoti"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G dati atspējoti"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobilie dati atspējoti"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Vairāk iestatījumu"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Piesaiste"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Tīklājs"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"JAUNĀKIE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Paziņojumi"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informācija par lietojumprogrammu"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"Meklēt"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Tīkls var\ntikt uzraudzīts"</string> @@ -226,4 +233,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Velciet uz augšu, lai atbloķētu"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Līdz brīdim, kad izslēgsiet"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Vienu minūti"</item> + <item quantity="other" msgid="6924190729213550991">"%d min"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Vienu stundu"</item> + <item quantity="other" msgid="5408537517529822157">"%d h"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 773a6fb..6a2e79e 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Идэвхижсэн."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Унтраах"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Холбогдсон."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Блютүүт <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Байршил <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Сэрүүлгийг <xliff:g id="TIME">%s</xliff:g>-д тохируулсан."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G дата идэвхгүй болов"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G дата идэвхгүй байна"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Мобайл дата идэвхгүй болов"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Өөр тохиргоо"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Модем болгох"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Сүлжээний цэг"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"СҮҮЛИЙН"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Мэдэгдэл"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Сүүлд ашигласан апп байхгүй"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Аппликешны мэдээлэл"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"хайх"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Сүлжээ хянагдаж\nбайж болзошгүй"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Таныг унтраах хүртэл"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Нэг минутын турш"</item> + <item quantity="other" msgid="6924190729213550991">"%d минутын турш"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Нэг цагийн турш"</item> + <item quantity="other" msgid="5408537517529822157">"%d цагийн турш"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index 09e52cc..7ae9b55 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Dihidupkan."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Dimatikan."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Disambungkan."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Lokasi <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Penggera ditetapkan pada <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Data 2G-3G dilumpuhkan"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Data 4G dilumpuhkan"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Data mudah alih dilumpuhkan"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Lagi tetapan"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Penambatan"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Tempat liputan"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"TERBAHARU"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Pemberitahuan"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Maklumat Aplikasi"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"cari"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Rangkaian mungkin\nboleh dipantau"</string> @@ -223,8 +230,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d lagi"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Leret ke atas untuk membuka kunci"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Sehingga anda matikan"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Selama satu minit"</item> + <item quantity="other" msgid="6924190729213550991">"Selama %d minit"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Selama satu jam"</item> + <item quantity="other" msgid="5408537517529822157">"Selama %d jam"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 7ffd381..e842c0f 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"På."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Av."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Tilkoblet."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth – <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Posisjon <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarmen ble stilt for <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G-data er deaktivert"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G-data er deaktivert"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobildata er deaktivert"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Flere innstillinger"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tilknytning"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Wi-Fi-sone"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"NYLIGE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Varsler"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Ingen nylige apper"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformasjon"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"Søk"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Nettverket kan\nvære overvåket"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Sveip oppover for å låse opp"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Inntil du slår av funksjonen"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"I ett minutt"</item> + <item quantity="other" msgid="6924190729213550991">"I %d minutter"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"I én time"</item> + <item quantity="other" msgid="5408537517529822157">"I %d timer"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index e79adf9..360b71d 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Ingeschakeld."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Uitgeschakeld."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Verbonden."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Locatie <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm is ingesteld op <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-/3G-gegevens uitgeschakeld"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G-gegevens uitgeschakeld"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobiele gegevens uitgeschakeld"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Meer instellingen"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Meldingen"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Geen recente apps"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"App-informatie"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"zoeken"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Netwerk kan\nworden gecontroleerd"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Veeg omhoog om te ontgrendelen"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Totdat u dit uitschakelt"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Eén minuut"</item> + <item quantity="other" msgid="6924190729213550991">"%d minuten"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Eén uur"</item> + <item quantity="other" msgid="5408537517529822157">"%d uur"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index aec7e87..25098d8 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Wł."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Wył."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Połączono."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Lokalizacja <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm ustawiony na <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Wyłączono transmisję danych 2G/3G"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Wyłączono transmisję danych 4G"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Transmisja danych została wyłączona"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Więcej ustawień"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Powiązanie"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Punkt dostępu"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"OSTATNIE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Powiadomienia"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Brak ostatnio uruchomionych aplikacji"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacje o aplikacji"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"szukaj"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Sieć może być\nmonitorowana"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Przesuń w górę, by odblokować"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Dopóki nie wyłączysz"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Przez minutę"</item> + <item quantity="other" msgid="6924190729213550991">"Przez %d min"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Przez godzinę"</item> + <item quantity="other" msgid="5408537517529822157">"Przez %d godz."</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 93c7f60..34adc46 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Ativado."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Desativado."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Ligado."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Localização <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarme definido para <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Os dados 2G-3G estão desativados"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Os dados 4G estão desativados"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Os dados móveis estão desativados"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Mais definições"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Associação"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Zona Wi-Fi"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTES"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificações"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Nenhuma aplicação recente"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações da aplicação"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"A rede pode ser\nmonitorizada"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Deslizar rapidamente com o dedo para cima para desbloquear"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Até que o utilizador desative"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Durante um minuto"</item> + <item quantity="other" msgid="6924190729213550991">"Durante %d minutos"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Durante uma hora"</item> + <item quantity="other" msgid="5408537517529822157">"Durante %d horas"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 079c8f0..e3b1f84 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Ligado."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Desligado."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Conectado."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Localização <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarme definido para <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Dados 2G e 3G desativados"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Dados 4G desativados"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Dados móveis desativados"</string> @@ -204,16 +209,14 @@ <string name="quick_settings_remote_display_no_connection_label" msgid="372107699274391290">"Transmitir tela"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brilho"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> - <!-- no translation found for quick_settings_inversion_label (8790919884718619648) --> - <skip /> + <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Inverter cores"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"Modo de correção de cor"</string> - <!-- no translation found for quick_settings_more_settings (326112621462813682) --> - <skip /> - <!-- no translation found for quick_settings_tethering_label (7153452060448575549) --> - <skip /> - <!-- no translation found for quick_settings_hotspot_label (6046917934974004879) --> + <string name="quick_settings_more_settings" msgid="326112621462813682">"Mais configurações"</string> + <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> + <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Ponto de acesso"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificações"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> <skip /> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTES"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações do aplicativo"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"A rede pode estar\nsob monitoração"</string> @@ -229,8 +232,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"Mais %d"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Deslize para cima para desbloquear"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Até você desativar"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Por 1 minuto"</item> + <item quantity="other" msgid="6924190729213550991">"Por %d minutos"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Por 1 hora"</item> + <item quantity="other" msgid="5408537517529822157">"Por %d horas"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml index b9d121a..e6a3872 100644 --- a/packages/SystemUI/res/values-rm/strings.xml +++ b/packages/SystemUI/res/values-rm/strings.xml @@ -210,6 +210,8 @@ <skip /> <!-- no translation found for accessibility_desc_connected (8366256693719499665) --> <skip /> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <!-- no translation found for accessibility_data_connection_gprs (1606477224486747751) --> <skip /> <!-- no translation found for accessibility_data_connection_1x (994133468120244018) --> @@ -282,6 +284,12 @@ <skip /> <!-- no translation found for accessibility_quick_settings_alarm (3959908972897295660) --> <skip /> + <!-- no translation found for accessibility_quick_settings_close (2571790856136835943) --> + <skip /> + <!-- no translation found for accessibility_quick_settings_more_time (5778794273488176726) --> + <skip /> + <!-- no translation found for accessibility_quick_settings_less_time (101026945195230084) --> + <skip /> <!-- no translation found for data_usage_disabled_dialog_3g_title (5257833881698644687) --> <skip /> <!-- no translation found for data_usage_disabled_dialog_4g_title (4789143363492682629) --> @@ -384,7 +392,9 @@ <skip /> <!-- no translation found for quick_settings_hotspot_label (6046917934974004879) --> <skip /> - <!-- no translation found for recents_empty_message (2269156590813544104) --> + <!-- no translation found for quick_settings_notifications_label (4818156442169154523) --> + <skip /> + <!-- no translation found for recents_empty_message (7883614615463619450) --> <skip /> <!-- no translation found for recents_app_info_button_label (2890317189376000030) --> <skip /> @@ -411,4 +421,10 @@ <skip /> <!-- no translation found for keyguard_unlock (8043466894212841998) --> <skip /> + <!-- no translation found for zen_mode_forever (7420011936770086993) --> + <skip /> + <!-- no translation found for zen_mode_duration_minutes:one (9040808414992812341) --> + <!-- no translation found for zen_mode_duration_minutes:other (6924190729213550991) --> + <!-- no translation found for zen_mode_duration_hours:one (3480040795582254384) --> + <!-- no translation found for zen_mode_duration_hours:other (5408537517529822157) --> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 10afe88..9bc9178 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Activat."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Dezactivat."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Conectat."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Locație: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarmă setată pentru <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Datele 2G-3G au fost dezactivate"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Datele 4G au fost dezactivate"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Datele mobile au fost dezactivate"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Mai multe setări"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"RECENTE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notificări"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Nicio aplicație recentă"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informații despre aplicație"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"căutare"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Rețeaua poate\nfi monitorizată"</string> @@ -223,8 +229,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"Încă %d"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Glisați în sus pentru a debloca"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Până la dezactivare"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Timp de un minut"</item> + <item quantity="other" msgid="6924190729213550991">"Timp de %d (de) minute"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Timp de o oră"</item> + <item quantity="other" msgid="5408537517529822157">"Timp de %d (de) ore"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index c726014..619ebc2 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Вкл."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Выкл."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Подключено"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Доступ к геоданным <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Будильник установлен на <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Передача данных по каналам 2G и 3G отключена"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Передача данных по каналу 4G отключена"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Моб. Интернет отключен"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Дополнительные настройки"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Режим модема"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Точка доступа"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"НЕДАВНИЕ СООБЩЕНИЯ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Уведомления"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Ничего не найдено."</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Сведения о приложении"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"поиск"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Действия в сети\nмогут отслеживаться"</string> @@ -228,4 +234,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Пока я не отключу"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1 мин."</item> + <item quantity="other" msgid="6924190729213550991">"%d мин."</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1 ч."</item> + <item quantity="other" msgid="5408537517529822157">"%d ч."</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 45bb2ad..df880cf 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Zapnuté."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Vypnuté."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Pripojené."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Poloha: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Budík nastavený na <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Dátové prenosy 2G a 3G sú zakázané"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Dátové prenosy 4G sú zakázané"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobilné dátové prenosy sú zakázané"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Ďalšie nastavenia"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Zdieľanie dátového pripojenia"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"NEDÁVNE"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Upozornenia"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Žiadne nedávne aplikácie"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informácie o aplikácii"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"hľadať"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Sieť môže byť\nmonitorovaná"</string> @@ -228,4 +234,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Zariadenie odomknete prejdením prstom nahor"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Dokým túto funkciu nevypnete"</string> + <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> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Na jednu hodinu"</item> + <item quantity="other" msgid="5408537517529822157">"Na %d h"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 99470d6..d1170bd 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Vklopljen."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Izklopljen."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Povezan."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Lokacija: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm je nastavljen na <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Podatki 2G-3G so onemogočeni"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Podatki 4G so onemogočeni"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobilni podatki so onemogočeni"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Več nastavitev"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Internet prek mobilne naprave"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Dostopna točka"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"NEDAVNI"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Obvestila"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Ni nedavnih aplikacij"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Podatki o aplikaciji"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"iskanje"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Omrežje je\nlahko spremljano"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Povlecite, da odklenete"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Dokler tega ne izklopite"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Za eno minuto"</item> + <item quantity="other" msgid="6924190729213550991">"Za %d min"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Za eno uro"</item> + <item quantity="other" msgid="5408537517529822157">"Za %d h"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 1e40ed6..cfb6a2c 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Укључено."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Искључено."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Повезано је."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Локација је <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Аларм је подешен за <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G–3G подаци су онемогућени"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G подаци су онемогућени"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Подаци мобилне мреже су онемогућени"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Још подешавања"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Повезивање"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Хотспот"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"НАЈНОВИЈЕ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Обавештења"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Нема недавних апликација"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Информације о апликацији"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"претражи"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Мрежа се можда\nнадгледа"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Док не искључите"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Један минут"</item> + <item quantity="other" msgid="6924190729213550991">"%d мин"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Један сат"</item> + <item quantity="other" msgid="5408537517529822157">"%d с"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index e4d7471..4e3d72f 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Aktiverad."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Inaktiverad."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Ansluten."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Plats <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarmet ringer <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Data via 2G-3G har inaktiverats"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Data via 4G har inaktiverats"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobildata har inaktiverats"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Fler inställningar"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Internetdelning"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Trådlös surfzon"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"NYA"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Aviseringar"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformation"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"sök"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Nätverket kan\nvara övervakat"</string> @@ -226,4 +233,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Dra uppåt om du vill låsa upp"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Tills du inaktiverar detta"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"I en minut"</item> + <item quantity="other" msgid="6924190729213550991">"I %d minuter"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"I en timme"</item> + <item quantity="other" msgid="5408537517529822157">"I %d timmar"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 1d27854..9bab46e 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -118,6 +118,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Imewashwa."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Imezimwa."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Imeunganishwa."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -154,6 +156,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Mahali <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Kengele imewekwa <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Data ya 2G-3G imelemazwa"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Data ya 4G imelemazwa"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Data ya kifaa cha mkononi imelemazwa"</string> @@ -205,7 +210,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Mipangilio zaidi"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Kusambaza mtandao"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Mtandao-hewa"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"YA HIVI KARIBUNI"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Arifa"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Hakuna programu za karibuni"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Maelezo ya Programu"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"tafuta"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Huenda mtandao\nunafuatiliwa"</string> @@ -221,7 +227,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d zaidi"</item> </plurals> - <string name="speed_bump_explanation" msgid="1288875699658819755">"Arifa zisizokuwa za dharura sana hapo chini"</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> <string name="keyguard_unlock" msgid="8043466894212841998">"Telezesha kidole ili ufungue"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Hadi utakapozima hili"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Kwa dakika moja"</item> + <item quantity="other" msgid="6924190729213550991">"Kwa dakika %d"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Kwa saa moja"</item> + <item quantity="other" msgid="5408537517529822157">"Kwa saa %d"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 306416b..4820071 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"เปิดอยู่"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"ปิดอยู่"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"เชื่อมต่อแล้ว"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"บลูทูธ <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"สถานที่ <xliff:g id="STATE">%s</xliff:g>"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"ตั้งเวลาปลุกไว้ที่ <xliff:g id="TIME">%s</xliff:g>"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"ปิดใช้งานข้อมูล 2G-3G แล้ว"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"ปิดใช้งานข้อมูล 4G แล้ว"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"ปิดใช้งานข้อมูลมือถือแล้ว"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"การตั้งค่าเพิ่มเติม"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"การปล่อยสัญญาณ"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"ฮอตสปอต"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ล่าสุด"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"การแจ้งเตือน"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"ไม่มีแอปล่าสุด"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ข้อมูลแอปพลิเคชัน"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ค้นหา"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"เครือข่ายอาจ\nถูกตรวจสอบ"</string> @@ -223,7 +229,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"อีก %d"</item> </plurals> - <string name="speed_bump_explanation" msgid="1288875699658819755">"การแจ้งเตือนที่เร่งด่วนน้อยทางด้านล่าง"</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="zen_mode_forever" msgid="7420011936770086993">"จนกว่าคุณจะปิดฟังก์ชันนี้"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1 นาที"</item> + <item quantity="other" msgid="6924190729213550991">"%d นาที"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1 ชั่วโมง"</item> + <item quantity="other" msgid="5408537517529822157">"%d ชั่วโมง"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index debef15..6c6af51 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Naka-on."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Naka-off."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Nakakonekta."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"<xliff:g id="STATE">%s</xliff:g> ng Bluetooth."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Lokasyon <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm set para sa <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Di pinapagana ang 2G-3G na data"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Hindi pinapagana ang 4G na data"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Hindi pinapagana ang data ng mobile"</string> @@ -202,16 +207,13 @@ <string name="quick_settings_remote_display_no_connection_label" msgid="372107699274391290">"I-cast ang Screen"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brightness"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> - <!-- no translation found for quick_settings_inversion_label (8790919884718619648) --> - <skip /> + <string name="quick_settings_inversion_label" msgid="8790919884718619648">"I-invert ang mga kulay"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"Mode ng pagtatama ng kulay"</string> - <!-- no translation found for quick_settings_more_settings (326112621462813682) --> - <skip /> - <!-- no translation found for quick_settings_tethering_label (7153452060448575549) --> - <skip /> - <!-- no translation found for quick_settings_hotspot_label (6046917934974004879) --> - <skip /> - <string name="recents_empty_message" msgid="2269156590813544104">"MGA KAMAKAILAN"</string> + <string name="quick_settings_more_settings" msgid="326112621462813682">"Marami pang setting"</string> + <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Nagte-tether"</string> + <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Mga Notification"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Walang kamakailang mga app"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Impormasyon ng Application"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"maghanap"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Maaaring\nsinusubaybayan ang network"</string> @@ -227,8 +229,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"%d pa"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Mag-swipe pataas upang i-unlock"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Hanggang sa i-off mo ito"</string> + <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> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Sa loob ng isang oras"</item> + <item quantity="other" msgid="5408537517529822157">"Sa loob ng %d (na) oras"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 506d27e..85ba8fe 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Açık."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Kapalı."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Bağlandı."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Konum: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm saati: <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G verileri devre dışı bırakıldı"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G verileri devre dışı"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Mobil veriler devre dışı"</string> @@ -207,7 +212,9 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Diğer ayarlar"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"SON İLETİLER"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Bildirimler"</string> + <!-- no translation found for recents_empty_message (7883614615463619450) --> + <skip /> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Uygulama Bilgileri"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ara"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Ağ izleniyor\nolabilir"</string> @@ -226,4 +233,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Kilidi açmak için hızlıca yukarı kaydırın"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Siz bunu kapatana kadar"</string> + <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> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Bir saat süreyle"</item> + <item quantity="other" msgid="5408537517529822157">"%d saat süreyle"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 5b3c5b2..7f66e72 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Увімкнено."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Вимкнено."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Під’єднано."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth: <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Місцезнаходження <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Сигнал установлено на <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Дані 2G–3G вимкнено"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Дані 4G вимкнено"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Мобільне передавання даних вимкнено"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Більше налаштувань"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Режим модема"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Точка доступу"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"ОСТАННІ"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Сповіщення"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Немає останніх додатків"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Інформація про додаток"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"пошук"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Мережа може\nвідстежуватися"</string> @@ -226,4 +232,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"Доки ви не вимкнете"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Протягом хвилини"</item> + <item quantity="other" msgid="6924190729213550991">"Протягом %d хв"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Протягом години"</item> + <item quantity="other" msgid="5408537517529822157">"Протягом %d год"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index c6fddfe..3ddea96 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Bật."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Tắt."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Đã kết nối."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Vị trí <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Báo thức được đặt cho <xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"Đã tắt dữ liệu 2G-3G"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Đã tắt dữ liệu 4G"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Dữ liệu di động bị vô hiệu hóa"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Cài đặt khác"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Đang dùng làm điểm truy cập Internet"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Điểm phát sóng"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"GẦN ĐÂY"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Thông báo"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Không có ứng dụng nào gần đây"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Thông tin ứng dụng"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"tìm kiếm"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Mạng có thể\nđược giám sát"</string> @@ -226,4 +232,13 @@ <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> <string name="keyguard_unlock" msgid="8043466894212841998">"Vuốt lên để mở khóa"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Cho đến khi bạn tắt tính năng này"</string> + <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> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Trong một giờ"</item> + <item quantity="other" msgid="5408537517529822157">"Trong %d giờ"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index c6da6ac..934ac8c 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"开启。"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"关闭。"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"已连接。"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"蓝牙：<xliff:g id="STATE">%s</xliff:g>。"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"位置信息服务<xliff:g id="STATE">%s</xliff:g>。"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"闹钟已设置为：<xliff:g id="TIME">%s</xliff:g>。"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"2G-3G 数据网络已停用"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"4G 数据网络已停用"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"移动数据网络已停用"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"更多设置"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"网络共享"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"热点"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"最近"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"最近没有用过任何应用"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"应用信息"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"网络可能会\n受到监控"</string> @@ -225,8 +231,16 @@ <plurals name="keyguard_more_overflow_text"> <item quantity="other" msgid="9180696159506883684">"还有%d条"</item> </plurals> - <!-- no translation found for speed_bump_explanation (1288875699658819755) --> - <skip /> + <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="zen_mode_forever" msgid="7420011936770086993">"直到您将其关闭"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1分钟"</item> + <item quantity="other" msgid="6924190729213550991">"%d分钟"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1小时"</item> + <item quantity="other" msgid="5408537517529822157">"%d小时"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index ce9e260..40b56fe 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"開啟。"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"關閉。"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"已連線。"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"藍牙：<xliff:g id="STATE">%s</xliff:g>。"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"定位服務<xliff:g id="STATE">%s</xliff:g>。"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"鬧鐘已設定為：<xliff:g id="TIME">%s</xliff:g>。"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"已停用 2G-3G 數據"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"已停用 4G 數據"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"已停用流動數據"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"更多設定"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"網路共用"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"熱點"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"近期"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"沒有最近使用的應用程式"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資料"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"網絡可能會\n受到監控"</string> @@ -228,4 +234,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"直至您關閉這項設定"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1 分鐘"</item> + <item quantity="other" msgid="6924190729213550991">"%d 分鐘"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1 小時"</item> + <item quantity="other" msgid="5408537517529822157">"%d 小時"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index cafb688..c1a48c4 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"開啟。"</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"關閉。"</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"已連線。"</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> @@ -158,6 +160,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"藍牙：<xliff:g id="STATE">%s</xliff:g>。"</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"定位服務<xliff:g id="STATE">%s</xliff:g>。"</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"鬧鐘已設定為：<xliff:g id="TIME">%s</xliff:g>。"</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"已停用 2G-3G 數據"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"已停用 4G 數據"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"已停用行動數據"</string> @@ -209,7 +214,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"更多設定"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"網路共用"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"無線基地台"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"近期"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"沒有最近使用的應用程式"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資訊"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"網路可能\n受到監控"</string> @@ -228,4 +234,13 @@ <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="zen_mode_forever" msgid="7420011936770086993">"手動關閉這項設定前一律啟用"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"1 分鐘"</item> + <item quantity="other" msgid="6924190729213550991">"%d 分鐘"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"1 小時"</item> + <item quantity="other" msgid="5408537517529822157">"%d 小時"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 4865f7b..af49a7f 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -120,6 +120,8 @@ <string name="accessibility_desc_on" msgid="2385254693624345265">"Vula."</string> <string name="accessibility_desc_off" msgid="6475508157786853157">"Vala."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Ixhunyiwe."</string> + <!-- no translation found for accessibility_desc_connecting (3812924520316280149) --> + <skip /> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"I-HSPA"</string> @@ -156,6 +158,9 @@ <string name="accessibility_quick_settings_bluetooth" msgid="5749054971341882340">"I-Bluetooth <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_location" msgid="4577282329866813100">"Indawo i-<xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"I-alamu isethiwe ngo-<xliff:g id="TIME">%s</xliff:g>."</string> + <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> <string name="data_usage_disabled_dialog_3g_title" msgid="5257833881698644687">"idatha ye-2G-3G ivimbelwe"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="4789143363492682629">"Idatha ye-4G ivimbelwe"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="1046047248844821202">"Idatha yefoni ivimbelwe"</string> @@ -207,7 +212,8 @@ <string name="quick_settings_more_settings" msgid="326112621462813682">"Izilungiselelo eziningi"</string> <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Ukusebenzisa njengemodemu"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"I-Hotspot"</string> - <string name="recents_empty_message" msgid="2269156590813544104">"OKWAKAMUVA"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Izaziso"</string> + <string name="recents_empty_message" msgid="7883614615463619450">"Azikho izinhlelo zokusebenza zakamuva"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Ulwazi lohlelo lokusebenza"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"sesha"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Kungenzeka inethiwekhi\niqashiwe"</string> @@ -226,4 +232,13 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"Izaziso ezingasheshi kakhulu ezingezansi"</string> <string name="notification_tap_again" msgid="7590196980943943842">"Thepha futhi ukuze uvule"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"Swayiphela phezulu ukuze uvule"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Uze uvale lokhu"</string> + <plurals name="zen_mode_duration_minutes"> + <item quantity="one" msgid="9040808414992812341">"Iminithi elilodwa"</item> + <item quantity="other" msgid="6924190729213550991">"Amaminithi angu-%d"</item> + </plurals> + <plurals name="zen_mode_duration_hours"> + <item quantity="one" msgid="3480040795582254384">"Ihora elilodwa"</item> + <item quantity="other" msgid="5408537517529822157">"Amahora angu-%d"</item> + </plurals> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 757d4ad..34cfbe8 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -46,7 +46,7 @@ <drawable name="notification_item_background_color_pressed">#ff454545</drawable> <!-- Tint color for the content on the notification overflow card. --> - <color name="keyguard_overflow_content_color">#ff666666</color> + <color name="keyguard_overflow_content_color">#ff686868</color> <!-- The color of the red speed bump dot --> <color name="speed_bump_dot_red">#ffd50000</color> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 9f12124..35bc7e3 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -83,7 +83,7 @@ <dimen name="notification_mid_height">128dp</dimen> <!-- Height of a the summary ("more card") notification on keyguard. --> - <dimen name="notification_summary_height">40dp</dimen> + <dimen name="notification_summary_height">44dp</dimen> <!-- size at which Notification icons will be drawn in the status bar --> <dimen name="status_bar_icon_drawing_size">18dip</dimen> @@ -272,6 +272,9 @@ <!-- The padding between the individual notification cards. --> <dimen name="notification_padding">4dp</dimen> + <!-- The minimum amount of top overscroll to go to the quick settings. --> + <dimen name="min_top_overscroll_to_qs">36dp</dimen> + <!-- The height of the collapsed speed bump view. --> <dimen name="speed_bump_height_collapsed">24dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 7ab010a..de297e5 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -471,13 +471,13 @@ <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] --> <string name="quick_settings_brightness_label">Brightness</string> <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] --> - <string name="quick_settings_rotation_unlocked_label">Auto Rotate</string> + <string name="quick_settings_rotation_unlocked_label">Auto-rotate</string> <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] --> - <string name="quick_settings_rotation_locked_label">Rotation Locked</string> + <string name="quick_settings_rotation_locked_label">Rotation locked</string> <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] --> - <string name="quick_settings_rotation_locked_portrait_label">Locked to Portrait</string> + <string name="quick_settings_rotation_locked_portrait_label">Portrait</string> <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] --> - <string name="quick_settings_rotation_locked_landscape_label">Locked to Landscape</string> + <string name="quick_settings_rotation_locked_landscape_label">Landscape</string> <!-- QuickSettings: IME [CHAR LIMIT=NONE] --> <string name="quick_settings_ime_label">Input Method</string> <!-- QuickSettings: Location [CHAR LIMIT=NONE] --> @@ -505,7 +505,7 @@ <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] --> <string name="quick_settings_wifi_off_label">Wi-Fi Off</string> <!-- QuickSettings: Remote display [CHAR LIMIT=NONE] --> - <string name="quick_settings_remote_display_no_connection_label">Cast Screen</string> + <string name="quick_settings_remote_display_no_connection_label">Cast screen</string> <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] --> <string name="quick_settings_brightness_dialog_title">Brightness</string> <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] --> @@ -558,10 +558,8 @@ <!-- Zen mode: Short title. [CHAR LIMIT=40] --> <string name="zen_mode_title">Do not disturb</string> - <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=12] --> - <plurals name="keyguard_more_overflow_text"> - <item quantity="other">%d more</item> - </plurals> + <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] --> + <string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string> <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] --> <string name="speed_bump_explanation">Less urgent notifications below</string> @@ -583,6 +581,9 @@ <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] --> <string name="zen_mode_forever">Until you turn this off</string> + <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]--> + <string name="keyguard_indication_charging_time">Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string> + <!-- Zen mode condition: time duration in minutes. [CHAR LIMIT=NONE] --> <plurals name="zen_mode_duration_minutes"> <item quantity="one">For one minute</item> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 6a12232..4c269a2 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -197,6 +197,7 @@ <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault"> <item name="android:colorPrimary">@color/primary_color</item> + <item name="android:colorControlActivated">@color/system_accent_color</item> </style> <style name="NotificationsQuickSettings"> @@ -213,11 +214,6 @@ <item name="android:colorControlActivated">#ffffffff</item> </style> - <style name="QSAccentTheme" parent="@android:style/Theme.DeviceDefault"> - <item name="android:colorControlNormal">@color/system_accent_color</item> - <item name="android:colorControlActivated">@color/system_accent_color</item> - </style> - <style name="BorderlessButton" parent="@android:style/Widget.Quantum.Button.Borderless" /> <style name="BorderlessButton.Tiny"> diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index 4d6d815..006619b 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -42,6 +42,7 @@ public class ExpandHelper implements Gefingerpoken { boolean canChildBeExpanded(View v); void setUserExpandedChild(View v, boolean userExpanded); void setUserLockedChild(View v, boolean userLocked); + void expansionStateChanged(boolean isExpanding); } private static final String TAG = "ExpandHelper"; @@ -77,7 +78,6 @@ public class ExpandHelper implements Gefingerpoken { private boolean mWatchingForPull; private boolean mHasPopped; private View mEventSource; - private View mCurrView; private float mOldHeight; private float mNaturalHeight; private float mInitialTouchFocusY; @@ -86,8 +86,7 @@ public class ExpandHelper implements Gefingerpoken { private float mLastFocusY; private float mLastSpanY; private int mTouchSlop; - private int mLastMotionY; - private float mPopLimit; + private float mLastMotionY; private int mPopDuration; private float mPullGestureMinXSpan; private Callback mCallback; @@ -95,10 +94,14 @@ public class ExpandHelper implements Gefingerpoken { private ViewScaler mScaler; private ObjectAnimator mScaleAnimation; private Vibrator mVibrator; + private boolean mEnabled = true; + private ExpandableView mResizedView; + private float mCurrentHeight; private int mSmallSize; private int mLargeSize; private float mMaximumStretch; + private boolean mOnlyMovements; private int mGravity; @@ -109,17 +112,14 @@ public class ExpandHelper implements Gefingerpoken { @Override public boolean onScaleBegin(ScaleGestureDetector detector) { if (DEBUG_SCALE) Log.v(TAG, "onscalebegin()"); - float focusX = detector.getFocusX(); - float focusY = detector.getFocusY(); - final ExpandableView underFocus = findView(focusX, focusY); - startExpanding(underFocus, STRETCH); + startExpanding(mResizedView, STRETCH); return mExpanding; } @Override public boolean onScale(ScaleGestureDetector detector) { - if (DEBUG_SCALE) Log.v(TAG, "onscale() on " + mCurrView); + if (DEBUG_SCALE) Log.v(TAG, "onscale() on " + mResizedView); return true; } @@ -138,6 +138,7 @@ public class ExpandHelper implements Gefingerpoken { public void setHeight(float h) { if (DEBUG_SCALE) Log.v(TAG, "SetHeight: setting to " + h); mView.setActualHeight((int) h); + mCurrentHeight = h; } public float getHeight() { return mView.getActualHeight(); @@ -165,7 +166,6 @@ public class ExpandHelper implements Gefingerpoken { mGravity = Gravity.TOP; mScaleAnimation = ObjectAnimator.ofFloat(mScaler, "height", 0f); mScaleAnimation.setDuration(EXPAND_DURATION); - mPopLimit = mContext.getResources().getDimension(R.dimen.blinds_pop_threshold); mPopDuration = mContext.getResources().getInteger(R.integer.blinds_pop_duration_ms); mPullGestureMinXSpan = mContext.getResources().getDimension(R.dimen.pull_span_min); @@ -188,7 +188,6 @@ public class ExpandHelper implements Gefingerpoken { float target = hand + mOldHeight; float newHeight = clamp(target); mScaler.setHeight(newHeight); - mLastFocusY = mSGD.getFocusY(); mLastSpanY = mSGD.getCurrentSpan(); } @@ -252,6 +251,9 @@ public class ExpandHelper implements Gefingerpoken { @Override public boolean onInterceptTouchEvent(MotionEvent ev) { + if (!isEnabled()) { + return false; + } final int action = ev.getAction(); if (DEBUG_SCALE) Log.d(TAG, "intercept: act=" + MotionEvent.actionToString(action) + " expanding=" + mExpanding + @@ -270,38 +272,34 @@ public class ExpandHelper implements Gefingerpoken { if (DEBUG_SCALE) Log.d(TAG, "set initial span: " + mInitialTouchSpan); if (mExpanding) { + mLastMotionY = ev.getRawY(); return true; } else { if ((action == MotionEvent.ACTION_MOVE) && 0 != (mExpansionStyle & BLINDS)) { // we've begun Venetian blinds style expansion return true; } - final float xspan = mSGD.getCurrentSpanX(); - if ((action == MotionEvent.ACTION_MOVE && - xspan > mPullGestureMinXSpan && - xspan > mSGD.getCurrentSpanY())) { - // detect a vertical pulling gesture with fingers somewhat separated - if (DEBUG_SCALE) Log.v(TAG, "got pull gesture (xspan=" + xspan + "px)"); - - final ExpandableView underFocus = findView(x, y); - startExpanding(underFocus, PULL); - return true; - } - if (mScrollAdapter != null && !mScrollAdapter.isScrolledToTop()) { - return false; - } - // Now look for other gestures switch (action & MotionEvent.ACTION_MASK) { case MotionEvent.ACTION_MOVE: { + final float xspan = mSGD.getCurrentSpanX(); + if (xspan > mPullGestureMinXSpan && + xspan > mSGD.getCurrentSpanY() && !mExpanding) { + // detect a vertical pulling gesture with fingers somewhat separated + if (DEBUG_SCALE) Log.v(TAG, "got pull gesture (xspan=" + xspan + "px)"); + startExpanding(mResizedView, PULL); + mWatchingForPull = false; + } if (mWatchingForPull) { - final int yDiff = y - mLastMotionY; + final float yDiff = ev.getRawY() - mInitialTouchY; if (yDiff > mTouchSlop) { if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)"); - mLastMotionY = y; - final ExpandableView underFocus = findView(x, y); - if (startExpanding(underFocus, BLINDS)) { - mInitialTouchY = mLastMotionY; - mHasPopped = false; + mWatchingForPull = false; + if (mResizedView != null && !isFullyExpanded(mResizedView)) { + if (startExpanding(mResizedView, BLINDS)) { + mLastMotionY = ev.getRawY(); + mInitialTouchY = ev.getRawY(); + mHasPopped = false; + } } } } @@ -310,8 +308,10 @@ public class ExpandHelper implements Gefingerpoken { case MotionEvent.ACTION_DOWN: mWatchingForPull = mScrollAdapter != null && - isInside(mScrollAdapter.getHostView(), x, y); - mLastMotionY = y; + isInside(mScrollAdapter.getHostView(), x, y) + && mScrollAdapter.isScrolledToTop(); + mResizedView = findView(x, y); + mInitialTouchY = ev.getY(); break; case MotionEvent.ACTION_CANCEL: @@ -321,12 +321,28 @@ public class ExpandHelper implements Gefingerpoken { clearView(); break; } + mLastMotionY = ev.getRawY(); return mExpanding; } } + public void setEnabled(boolean enable) { + mEnabled = enable; + } + + private boolean isEnabled() { + return mEnabled; + } + + private boolean isFullyExpanded(ExpandableView underFocus) { + return underFocus.getIntrinsicHeight() == underFocus.getMaxHeight(); + } + @Override public boolean onTouchEvent(MotionEvent ev) { + if (!isEnabled()) { + return false; + } final int action = ev.getActionMasked(); if (DEBUG_SCALE) Log.d(TAG, "touch: act=" + MotionEvent.actionToString(action) + " expanding=" + mExpanding + @@ -335,47 +351,71 @@ public class ExpandHelper implements Gefingerpoken { (0 != (mExpansionStyle & STRETCH) ? " (stretch)" : "")); mSGD.onTouchEvent(ev); + final int x = (int) mSGD.getFocusX(); + final int y = (int) mSGD.getFocusY(); + if (mOnlyMovements) { + mLastMotionY = ev.getRawY(); + return false; + } switch (action) { + case MotionEvent.ACTION_DOWN: + mWatchingForPull = mScrollAdapter != null && + isInside(mScrollAdapter.getHostView(), x, y); + mResizedView = findView(x, y); + mInitialTouchY = ev.getY(); + break; case MotionEvent.ACTION_MOVE: { - if (0 != (mExpansionStyle & BLINDS)) { - final float rawHeight = ev.getY() - mInitialTouchY + mOldHeight; + if (mWatchingForPull) { + final float yDiff = ev.getRawY() - mInitialTouchY; + if (yDiff > mTouchSlop) { + if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)"); + mWatchingForPull = false; + if (mResizedView != null && !isFullyExpanded(mResizedView)) { + if (startExpanding(mResizedView, BLINDS)) { + mInitialTouchY = ev.getRawY(); + mLastMotionY = ev.getRawY(); + mHasPopped = false; + } + } + } + } + if (mExpanding && 0 != (mExpansionStyle & BLINDS)) { + final float rawHeight = ev.getRawY() - mLastMotionY + mCurrentHeight; final float newHeight = clamp(rawHeight); - final boolean wasClosed = (mOldHeight == mSmallSize); boolean isFinished = false; + boolean expanded = false; if (rawHeight > mNaturalHeight) { isFinished = true; + expanded = true; } if (rawHeight < mSmallSize) { isFinished = true; + expanded = false; } - final float pull = Math.abs(ev.getY() - mInitialTouchY); - if (mHasPopped || pull > mPopLimit) { - if (!mHasPopped) { - vibrate(mPopDuration); - mHasPopped = true; - } - } - - if (mHasPopped) { - mScaler.setHeight(newHeight); + if (!mHasPopped) { + vibrate(mPopDuration); + mHasPopped = true; } - final int x = (int) mSGD.getFocusX(); - final int y = (int) mSGD.getFocusY(); - ExpandableView underFocus = findView(x, y); - if (isFinished && underFocus != null && underFocus != mCurrView) { - finishExpanding(false); // @@@ needed? - startExpanding(underFocus, BLINDS); - mInitialTouchY = y; - mHasPopped = false; + mScaler.setHeight(newHeight); + mLastMotionY = ev.getRawY(); + if (isFinished) { + mCallback.setUserExpandedChild(mResizedView, expanded); + mCallback.expansionStateChanged(false); + return false; + } else { + mCallback.expansionStateChanged(true); } return true; } if (mExpanding) { + + // Gestural expansion is running updateExpansion(); + mLastMotionY = ev.getRawY(); return true; } @@ -396,7 +436,8 @@ public class ExpandHelper implements Gefingerpoken { clearView(); break; } - return true; + mLastMotionY = ev.getRawY(); + return mResizedView != null; } /** @@ -407,15 +448,16 @@ public class ExpandHelper implements Gefingerpoken { return false; } mExpansionStyle = expandType; - if (mExpanding && v == mCurrView) { + if (mExpanding && v == mResizedView) { return true; } mExpanding = true; + mCallback.expansionStateChanged(true); if (DEBUG) Log.d(TAG, "scale type " + expandType + " beginning on view: " + v); mCallback.setUserLockedChild(v, true); - setView(v); - mScaler.setView((ExpandableView) v); + mScaler.setView(v); mOldHeight = mScaler.getHeight(); + mCurrentHeight = mOldHeight; if (mCallback.canChildBeExpanded(v)) { if (DEBUG) Log.d(TAG, "working on an expandable child"); mNaturalHeight = mScaler.getNaturalHeight(mLargeSize); @@ -425,14 +467,13 @@ public class ExpandHelper implements Gefingerpoken { } if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight + " mNaturalHeight: " + mNaturalHeight); - v.getParent().requestDisallowInterceptTouchEvent(true); return true; } private void finishExpanding(boolean force) { if (!mExpanding) return; - if (DEBUG) Log.d(TAG, "scale in finishing on view: " + mCurrView); + if (DEBUG) Log.d(TAG, "scale in finishing on view: " + mResizedView); float currentHeight = mScaler.getHeight(); float targetHeight = mSmallSize; @@ -446,11 +487,12 @@ public class ExpandHelper implements Gefingerpoken { if (mScaleAnimation.isRunning()) { mScaleAnimation.cancel(); } - mCallback.setUserExpandedChild(mCurrView, targetHeight == mNaturalHeight); + mCallback.setUserExpandedChild(mResizedView, targetHeight == mNaturalHeight); + mCallback.expansionStateChanged(false); if (targetHeight != currentHeight) { mScaleAnimation.setFloatValues(targetHeight); mScaleAnimation.setupStartValues(); - final View scaledView = mCurrView; + final View scaledView = mResizedView; mScaleAnimation.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -460,7 +502,7 @@ public class ExpandHelper implements Gefingerpoken { }); mScaleAnimation.start(); } else { - mCallback.setUserLockedChild(mCurrView, false); + mCallback.setUserLockedChild(mResizedView, false); } mExpanding = false; @@ -470,16 +512,11 @@ public class ExpandHelper implements Gefingerpoken { if (DEBUG) Log.d(TAG, "currentHeight is: " + currentHeight); if (DEBUG) Log.d(TAG, "mSmallSize is: " + mSmallSize); if (DEBUG) Log.d(TAG, "targetHeight is: " + targetHeight); - if (DEBUG) Log.d(TAG, "scale was finished on view: " + mCurrView); + if (DEBUG) Log.d(TAG, "scale was finished on view: " + mResizedView); } private void clearView() { - mCurrView = null; - - } - - private void setView(View v) { - mCurrView = v; + mResizedView = null; } /** @@ -494,6 +531,18 @@ public class ExpandHelper implements Gefingerpoken { } /** + * Change the expansion mode to only observe movements and don't perform any resizing. + * This is needed when the expanding is finished and the scroller kicks in, + * performing an overscroll motion. We only want to shrink it again when we are not + * overscrolled. + * + * @param onlyMovements Should only movements be observed? + */ + public void onlyObserveMovements(boolean onlyMovements) { + mOnlyMovements = onlyMovements; + } + + /** * Triggers haptic feedback. */ private synchronized void vibrate(long duration) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java index 7b6c544..901cc10 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java @@ -18,6 +18,8 @@ package com.android.systemui.qs; import android.animation.ValueAnimator; import android.content.Context; +import android.graphics.ColorFilter; +import android.graphics.LightingColorFilter; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; @@ -29,6 +31,7 @@ import com.android.systemui.qs.QSTile.SignalState; public final class SignalTileView extends QSTileView { private static final long DEFAULT_DURATION = new ValueAnimator().getDuration(); private static final long SHORT_DURATION = DEFAULT_DURATION / 3; + private static final ColorFilter FILTER = new LightingColorFilter(0xffffffff, 0xff283034); private FrameLayout mIconFrame; private ImageView mSignal; @@ -41,10 +44,12 @@ public final class SignalTileView extends QSTileView { mIn = new ImageView(context); mIn.setImageResource(R.drawable.ic_qs_signal_in); + mIn.setColorFilter(FILTER); addView(mIn); mOut = new ImageView(context); mOut.setImageResource(R.drawable.ic_qs_signal_out); + mOut.setColorFilter(FILTER); addView(mOut); } @@ -88,10 +93,12 @@ public final class SignalTileView extends QSTileView { final SignalState s = (SignalState) state; mSignal.setImageDrawable(null); // force refresh mSignal.setImageResource(s.iconId); + mSignal.setColorFilter(FILTER); if (s.overlayIconId > 0) { mOverlay.setVisibility(VISIBLE); mOverlay.setImageDrawable(null); // force refresh mOverlay.setImageResource(s.overlayIconId); + mOverlay.setColorFilter(FILTER); } else { mOverlay.setVisibility(GONE); } 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 d220e1a..20ed629 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -94,7 +94,7 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { } } else { state.iconId = R.drawable.ic_qs_bluetooth_off; - state.label = mContext.getString(R.string.quick_settings_bluetooth_off_label); + state.label = mContext.getString(R.string.quick_settings_bluetooth_label); stateContentDescription = mContext.getString(R.string.accessibility_desc_off); } state.contentDescription = mContext.getString( 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 e496468..db9b054 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -85,7 +85,7 @@ public class LocationTile extends QSTile<QSTile.BooleanState> { mContext.getString(R.string.accessibility_desc_on)); } else { if (state.icon == null) state.iconId = R.drawable.ic_qs_location_11; - state.label = mContext.getString(R.string.quick_settings_location_off_label); + 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)); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java index 20bbf8b..b981ed6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotificationsTile.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; import android.util.Log; -import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnAttachStateChangeListener; @@ -49,8 +48,7 @@ public class NotificationsTile extends QSTile<NotificationsTile.NotificationsSta @Override public View createDetailView(Context context, ViewGroup root) { - final Context themedContext = new ContextThemeWrapper(mContext, R.style.QSAccentTheme); - final View v = LayoutInflater.from(themedContext).inflate(R.layout.qs_detail, root, false); + final View v = LayoutInflater.from(context).inflate(R.layout.qs_detail, root, false); final TextView title = (TextView) v.findViewById(android.R.id.title); title.setText(R.string.quick_settings_notifications_label); final View close = v.findViewById(android.R.id.button1); 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 a1e70b9..6b73002 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -99,7 +99,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { signalContentDescription = r.getString(R.string.accessibility_no_wifi); } else { state.iconId = R.drawable.ic_qs_wifi_no_network; - state.label = r.getString(R.string.quick_settings_wifi_off_label); + state.label = r.getString(R.string.quick_settings_wifi_label); signalContentDescription = r.getString(R.string.accessibility_wifi_off); } state.contentDescription = mContext.getString( diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index fa85234..8680786 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -454,7 +454,9 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView public void onBackPressed() { // Unfilter any stacks if (!mRecentsView.unfilterFilteredStacks()) { - super.onBackPressed(); + if (!mRecentsView.launchFirstTask()) { + super.onBackPressed(); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedView.java b/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedView.java new file mode 100644 index 0000000..d2fe858 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedView.java @@ -0,0 +1,50 @@ +/* + * 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; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; + +/** + * A View which does not have overlapping renderings commands and therefore does not need a + * layer when alpha is changed. + */ +public class AlphaOptimizedView extends View +{ + public AlphaOptimizedView(Context context) { + super(context); + } + + public AlphaOptimizedView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public AlphaOptimizedView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public AlphaOptimizedView(Context context, AttributeSet attrs, int defStyleAttr, + int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + public boolean hasOverlappingRendering() { + return false; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java index 5b2ea0b..517a4e8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java @@ -25,7 +25,6 @@ import android.view.View; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; - import com.android.systemui.ExpandHelper; import com.android.systemui.Gefingerpoken; import com.android.systemui.R; @@ -87,6 +86,7 @@ public class DragDownHelper implements Gefingerpoken { captureStartingChild(mInitialTouchX, mInitialTouchY); mInitialTouchY = y; mInitialTouchX = x; + mOnDragDownListener.onTouchSlopExceeded(); return true; } break; @@ -202,5 +202,6 @@ public class DragDownHelper implements Gefingerpoken { void onDraggedDown(View startingChild); void onDragDownReset(); void onThresholdReached(); + void onTouchSlopExceeded(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java index 088f076..ac2537c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java @@ -69,7 +69,9 @@ public abstract class ExpandableView extends FrameLayout { ? MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.EXACTLY) : MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY); } - child.measure(widthMeasureSpec, childHeightSpec); + child.measure( + getChildMeasureSpec(widthMeasureSpec, 0 /* padding */, layoutParams.width), + childHeightSpec); int childHeight = child.getMeasuredHeight(); maxChildHeight = Math.max(maxChildHeight, childHeight); } else { @@ -79,7 +81,9 @@ public abstract class ExpandableView extends FrameLayout { int ownHeight = hasFixedHeight ? ownMaxHeight : maxChildHeight; newHeightSpec = MeasureSpec.makeMeasureSpec(ownHeight, MeasureSpec.EXACTLY); for (View child : mMatchParentViews) { - child.measure(widthMeasureSpec, newHeightSpec); + child.measure(getChildMeasureSpec( + widthMeasureSpec, 0 /* padding */, child.getLayoutParams().width), + newHeightSpec); } mMatchParentViews.clear(); int width = MeasureSpec.getSize(widthMeasureSpec); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java new file mode 100644 index 0000000..ce35e4b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -0,0 +1,190 @@ +/* + * 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; + +import com.android.internal.app.IBatteryStats; +import com.android.keyguard.KeyguardUpdateMonitor; +import com.android.keyguard.KeyguardUpdateMonitorCallback; +import com.android.systemui.R; +import com.android.systemui.statusbar.phone.KeyguardIndicationTextView; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.BatteryManager; +import android.os.BatteryStats; +import android.os.Handler; +import android.os.Message; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.os.UserHandle; +import android.text.TextUtils; +import android.text.format.Formatter; +import android.util.Log; +import android.view.View; + +/** + * Controls the little text indicator on the keyguard. + */ +public class KeyguardIndicationController { + + private static final String TAG = "KeyguardIndicationController"; + + private static final int MSG_HIDE_TRANSIENT = 1; + + private final Context mContext; + private final KeyguardIndicationTextView mTextView; + private final IBatteryStats mBatteryInfo; + + private String mRestingIndication; + private String mTransientIndication; + private boolean mVisible; + + private boolean mPowerPluggedIn; + private boolean mPowerCharged; + + public KeyguardIndicationController(Context context, KeyguardIndicationTextView textView) { + mContext = context; + mTextView = textView; + + mBatteryInfo = IBatteryStats.Stub.asInterface( + ServiceManager.getService(BatteryStats.SERVICE_NAME)); + KeyguardUpdateMonitor.getInstance(context).registerCallback(mUpdateMonitor); + context.registerReceiverAsUser( + mReceiver, UserHandle.OWNER, new IntentFilter(Intent.ACTION_TIME_TICK), null, null); + } + + public void setVisible(boolean visible) { + mVisible = visible; + mTextView.setVisibility(visible ? View.VISIBLE : View.GONE); + if (visible) { + hideTransientIndication(); + updateIndication(); + } + } + + /** + * Sets the indication that is shown if nothing else is showing. + */ + public void setRestingIndication(String restingIndication) { + mRestingIndication = restingIndication; + updateIndication(); + } + + /** + * Hides transient indication in {@param delayMs}. + */ + public void hideTransientIndicationDelayed(long delayMs) { + mHandler.sendMessageDelayed( + mHandler.obtainMessage(MSG_HIDE_TRANSIENT), delayMs); + } + + /** + * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}. + */ + public void showTransientIndication(int transientIndication) { + showTransientIndication(mContext.getResources().getString(transientIndication)); + } + + /** + * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}. + */ + public void showTransientIndication(String transientIndication) { + mTransientIndication = transientIndication; + mHandler.removeMessages(MSG_HIDE_TRANSIENT); + updateIndication(); + } + + /** + * Hides transient indication. + */ + public void hideTransientIndication() { + if (mTransientIndication != null) { + mTransientIndication = null; + mHandler.removeMessages(MSG_HIDE_TRANSIENT); + updateIndication(); + } + } + + private void updateIndication() { + if (mVisible) { + mTextView.switchIndication(computeIndication()); + } + } + + private String computeIndication() { + if (!TextUtils.isEmpty(mTransientIndication)) { + return mTransientIndication; + } + if (mPowerPluggedIn) { + return computePowerIndication(); + } + return mRestingIndication; + } + + private String computePowerIndication() { + if (mPowerCharged) { + return mContext.getResources().getString(R.string.keyguard_charged); + } + + // Try fetching charging time from battery stats. + try { + long chargingTimeRemaining = mBatteryInfo.computeChargeTimeRemaining(); + if (chargingTimeRemaining > 0) { + String chargingTimeFormatted = + Formatter.formatShortElapsedTime(mContext, chargingTimeRemaining); + return mContext.getResources().getString( + R.string.keyguard_indication_charging_time, chargingTimeFormatted); + } + } catch (RemoteException e) { + Log.e(TAG, "Error calling IBatteryStats: ", e); + } + + // Fall back to simple charging label. + return mContext.getResources().getString(R.string.keyguard_plugged_in); + } + + KeyguardUpdateMonitorCallback mUpdateMonitor = new KeyguardUpdateMonitorCallback() { + @Override + public void onRefreshBatteryInfo(KeyguardUpdateMonitor.BatteryStatus status) { + mPowerPluggedIn = status.status == BatteryManager.BATTERY_STATUS_CHARGING + || status.status == BatteryManager.BATTERY_STATUS_FULL; + mPowerCharged = status.isCharged(); + updateIndication(); + } + }; + + BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (mVisible) { + updateIndication(); + } + } + }; + + private final Handler mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + if (msg.what == MSG_HIDE_TRANSIENT && mTransientIndication != null) { + mTransientIndication = null; + updateIndication(); + } + } + }; +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowIconsView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowIconsView.java index ce31894..6819d9b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowIconsView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationOverflowIconsView.java @@ -18,15 +18,13 @@ package com.android.systemui.statusbar; import android.app.Notification; import android.content.Context; -import android.graphics.Color; +import android.content.res.Configuration; import android.graphics.PorterDuff; import android.util.AttributeSet; -import android.view.View; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.statusbar.StatusBarIcon; +import com.android.internal.util.NotificationColorUtil; import com.android.systemui.R; import com.android.systemui.statusbar.phone.IconMerger; @@ -37,6 +35,8 @@ public class NotificationOverflowIconsView extends IconMerger { private TextView mMoreText; private int mTintColor; + private int mIconSize; + private NotificationColorUtil mNotificationColorUtil = new NotificationColorUtil(); public NotificationOverflowIconsView(Context context, AttributeSet attrs) { super(context, attrs); @@ -46,6 +46,8 @@ public class NotificationOverflowIconsView extends IconMerger { protected void onFinishInflate() { super.onFinishInflate(); mTintColor = getResources().getColor(R.color.keyguard_overflow_content_color); + mIconSize = getResources().getDimensionPixelSize( + com.android.internal.R.dimen.status_bar_icon_size); } public void setMoreText(TextView moreText) { @@ -56,14 +58,24 @@ public class NotificationOverflowIconsView extends IconMerger { StatusBarIconView v = new StatusBarIconView(getContext(), "", notification.notification.getNotification()); v.setScaleType(ImageView.ScaleType.CENTER_INSIDE); - v.setColorFilter(mTintColor, PorterDuff.Mode.MULTIPLY); - addView(v); + addView(v, mIconSize, mIconSize); v.set(notification.icon.getStatusBarIcon()); + applyColor(notification.notification.getNotification(), v); updateMoreText(); } + private void applyColor(Notification notification, StatusBarIconView view) { + if (notification.color != Notification.COLOR_DEFAULT) { + if (mNotificationColorUtil.isGrayscale(view.getDrawable())) { + view.setColorFilter(mTintColor, PorterDuff.Mode.MULTIPLY); + } + } else { + view.setColorFilter(notification.color, PorterDuff.Mode.SRC_ATOP); + } + } + private void updateMoreText() { - mMoreText.setText(getResources().getQuantityString( - R.plurals.keyguard_more_overflow_text, getChildCount(), getChildCount())); + mMoreText.setText( + getResources().getString(R.string.keyguard_more_overflow_text, getChildCount())); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotView.java index 3ca021a..1503072 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotView.java @@ -41,6 +41,11 @@ public class SpeedBumpDotView extends View { canvas.drawCircle(radius, radius, radius, mPaint); } + @Override + public boolean hasOverlappingRendering() { + return false; + } + public void setColor(int color) { mPaint.setColor(color); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotsState.java b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotsState.java index 06a7f95..4febab1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotsState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpDotsState.java @@ -70,23 +70,12 @@ public class SpeedBumpDotsState { for (int i = 0; i < childCount; i++) { View child = mHostView.getChildAt(i); ViewState viewState = mStateMap.get(child); - float translationX = child.getTranslationX(); - float translationY = child.getTranslationY(); - float scale = child.getScaleX(); - float alpha = child.getAlpha(); - if (translationX != viewState.xTranslation) { - child.setTranslationX(viewState.xTranslation); - } - if (translationY != viewState.yTranslation) { - child.setTranslationY(viewState.yTranslation); - } - if (scale != viewState.scale) { - child.setScaleX(viewState.scale); - child.setScaleY(viewState.scale); - } - if (alpha != viewState.alpha) { - child.setAlpha(viewState.alpha); - } + + child.setTranslationX(viewState.xTranslation); + child.setTranslationY(viewState.yTranslation); + child.setScaleX(viewState.scale); + child.setScaleY(viewState.scale); + child.setAlpha(viewState.alpha); } } @@ -115,7 +104,7 @@ public class SpeedBumpDotsState { ViewState viewState = mStateMap.get(child); child.animate().setInterpolator(mFastOutSlowInInterpolator) .setStartDelay(startDelay) - .alpha(viewState.alpha).withLayer() + .alpha(viewState.alpha) .translationX(viewState.xTranslation) .translationY(viewState.yTranslation) .scaleX(viewState.scale).scaleY(viewState.scale); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java index a84daef..689d0e9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java @@ -37,8 +37,8 @@ public class SpeedBumpView extends ExpandableView implements View.OnClickListene private final int mDotsHeight; private final int mTextPaddingInset; private SpeedBumpDotsLayout mDots; - private View mLineLeft; - private View mLineRight; + private AlphaOptimizedView mLineLeft; + private AlphaOptimizedView mLineRight; private boolean mIsExpanded; private boolean mDividerVisible = true; private ValueAnimator mCurrentAnimator; @@ -89,8 +89,8 @@ public class SpeedBumpView extends ExpandableView implements View.OnClickListene protected void onFinishInflate() { super.onFinishInflate(); mDots = (SpeedBumpDotsLayout) findViewById(R.id.speed_bump_dots_layout); - mLineLeft = findViewById(R.id.speedbump_line_left); - mLineRight = findViewById(R.id.speedbump_line_right); + mLineLeft = (AlphaOptimizedView) findViewById(R.id.speedbump_line_left); + mLineRight = (AlphaOptimizedView) findViewById(R.id.speedbump_line_right); mExplanationText = (TextView) findViewById(R.id.speed_bump_text); resetExplanationText(); @@ -176,8 +176,7 @@ public class SpeedBumpView extends ExpandableView implements View.OnClickListene .scaleX(scale) .scaleY(scale) .translationY(translationY) - .setListener(needsHideListener ? mHideExplanationListener : null) - .withLayer(); + .setListener(needsHideListener ? mHideExplanationListener : null); mExplanationTextVisible = visible; } } @@ -211,7 +210,6 @@ public class SpeedBumpView extends ExpandableView implements View.OnClickListene float endTranslationXRight = nowVisible ? 0.0f : mCenterX - mLineRight.getLeft(); mLineLeft.animate() .alpha(endValue) - .withLayer() .scaleX(endValue) .scaleY(endValue) .translationX(endTranslationXLeft) @@ -219,7 +217,6 @@ public class SpeedBumpView extends ExpandableView implements View.OnClickListene .withEndAction(onFinishedRunnable); mLineRight.animate() .alpha(endValue) - .withLayer() .scaleX(endValue) .scaleY(endValue) .translationX(endTranslationXRight) 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 dbce718..b28dad7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -83,10 +83,7 @@ public class NotificationPanelView extends PanelView implements private float mQsExpansionHeight; private int mQsMinExpansionHeight; private int mQsMaxExpansionHeight; - private int mMinStackHeight; private int mQsPeekHeight; - private float mNotificationTranslation; - private int mStackScrollerIntrinsicPadding; private boolean mStackScrollerOverscrolling; private boolean mQsExpansionEnabled = true; private ValueAnimator mQsExpansionAnimator; @@ -165,7 +162,6 @@ public class NotificationPanelView extends PanelView implements super.loadDimens(); mNotificationTopPadding = getResources().getDimensionPixelSize( R.dimen.notifications_top_padding); - mMinStackHeight = getResources().getDimensionPixelSize(R.dimen.collapsed_stack_height); mFlingAnimationUtils = new FlingAnimationUtils(getContext(), 0.4f); mStatusBarMinHeight = getResources().getDimensionPixelSize( com.android.internal.R.dimen.status_bar_height); @@ -185,7 +181,8 @@ public class NotificationPanelView extends PanelView implements mQsMaxExpansionHeight = mHeader.getExpandedHeight() + mQsContainer.getHeight(); if (mQsExpanded) { if (mQsFullyExpanded) { - setQsStackScrollerPadding(mQsMaxExpansionHeight); + mQsExpansionHeight = mQsMaxExpansionHeight; + requestScrollerTopPaddingUpdate(false /* animate */); } } else { if (!mStackScrollerOverscrolling) { @@ -202,11 +199,12 @@ public class NotificationPanelView extends PanelView implements */ private void positionClockAndNotifications() { boolean animateClock = mNotificationStackScroller.isAddOrRemoveAnimationPending(); + int stackScrollerPadding; if (mStatusBar.getBarState() != StatusBarState.KEYGUARD) { int bottom = mStackScrollerOverscrolling ? mHeader.getCollapsedHeight() : mHeader.getBottom(); - mStackScrollerIntrinsicPadding = bottom + mQsPeekHeight + stackScrollerPadding = bottom + mQsPeekHeight + mNotificationTopPadding; mTopPaddingAdjustment = 0; } else { @@ -224,12 +222,11 @@ public class NotificationPanelView extends PanelView implements mKeyguardStatusView.setY(mClockPositionResult.clockY); } applyClockAlpha(mClockPositionResult.clockAlpha); - mStackScrollerIntrinsicPadding = mClockPositionResult.stackScrollerPadding; + stackScrollerPadding = mClockPositionResult.stackScrollerPadding; mTopPaddingAdjustment = mClockPositionResult.stackScrollerPaddingAdjustment; } - mNotificationStackScroller.setTopPadding(mStackScrollerIntrinsicPadding, - mAnimateNextTopPaddingChange || animateClock); - mAnimateNextTopPaddingChange = false; + mNotificationStackScroller.setIntrinsicPadding(stackScrollerPadding); + requestScrollerTopPaddingUpdate(animateClock); } private void startClockAnimation(int y) { @@ -384,6 +381,7 @@ public class NotificationPanelView extends PanelView implements mInitialTouchX = x; mQsTracking = true; mIntercepting = false; + mNotificationStackScroller.removeLongPressCallback(); return true; } break; @@ -523,6 +521,13 @@ public class NotificationPanelView extends PanelView implements updateQsState(); } + @Override + public void flingTopOverscroll(float velocity, boolean open) { + mStackScrollerOverscrolling = false; + setQsExpansion(mQsExpansionHeight); + flingSettings(velocity, open); + } + private void onQsExpansionStarted() { onQsExpansionStarted(0); } @@ -554,8 +559,11 @@ public class NotificationPanelView extends PanelView implements mHeader.setExpanded(expandVisually, mStackScrollerOverscrolling); mNotificationStackScroller.setEnabled(!mQsExpanded); mQsPanel.setVisibility(expandVisually ? View.VISIBLE : View.INVISIBLE); - mQsContainer.setVisibility(mKeyguardShowing && !mQsExpanded ? View.INVISIBLE : View.VISIBLE); + mQsContainer.setVisibility(mKeyguardShowing && !expandVisually + ? View.INVISIBLE + : View.VISIBLE); mScrollView.setTouchEnabled(mQsExpanded); + mNotificationStackScroller.setTouchEnabled(!mQsExpanded); } private void setQsExpansion(float height) { @@ -569,9 +577,7 @@ public class NotificationPanelView extends PanelView implements mQsExpansionHeight = height; mHeader.setExpansion(height - mQsPeekHeight); setQsTranslation(height); - if (!mStackScrollerOverscrolling) { - setQsStackScrollerPadding(height); - } + requestScrollerTopPaddingUpdate(false /* animate */); mStatusBar.userActivity(); } @@ -579,24 +585,12 @@ public class NotificationPanelView extends PanelView implements mQsContainer.setY(height - mQsContainer.getHeight()); } - private void setQsStackScrollerPadding(float height) { - float start = height - mScrollView.getScrollY() + mNotificationTopPadding; - float stackHeight = mNotificationStackScroller.getHeight() - start; - if (stackHeight <= mMinStackHeight) { - float overflow = mMinStackHeight - stackHeight; - stackHeight = mMinStackHeight; - start = mNotificationStackScroller.getHeight() - stackHeight; - mNotificationStackScroller.setTranslationY(overflow); - mNotificationTranslation = overflow + mScrollView.getScrollY(); - } else { - mNotificationStackScroller.setTranslationY(0); - mNotificationTranslation = mScrollView.getScrollY(); - } - mNotificationStackScroller.setTopPadding(clampQsStackScrollerPadding((int) start), false); - } - private int clampQsStackScrollerPadding(int desiredPadding) { - return Math.max(desiredPadding, mStackScrollerIntrinsicPadding); + private void requestScrollerTopPaddingUpdate(boolean animate) { + mNotificationStackScroller.updateTopPadding(mQsExpansionHeight, + mScrollView.getScrollY(), + mAnimateNextTopPaddingChange || animate); + mAnimateNextTopPaddingChange = false; } private void trackMovement(MotionEvent event) { @@ -705,9 +699,9 @@ public class NotificationPanelView extends PanelView implements protected int getMaxPanelHeight() { // TODO: Figure out transition for collapsing when QS is open, adjust height here. int maxPanelHeight = super.getMaxPanelHeight(); - int emptyBottomMargin = mStackScrollerContainer.getHeight() - - mNotificationStackScroller.getHeight() - + mNotificationStackScroller.getEmptyBottomMargin(); + int emptyBottomMargin = mNotificationStackScroller.getEmptyBottomMargin(); + emptyBottomMargin += mStackScrollerContainer.getHeight() + - mNotificationStackScroller.getHeight(); int maxHeight = maxPanelHeight - emptyBottomMargin - mTopPaddingAdjustment; maxHeight = Math.max(maxHeight, mStatusBarMinHeight); return maxHeight; @@ -814,13 +808,14 @@ public class NotificationPanelView extends PanelView implements @Override protected void onOverExpansionChanged(float overExpansion) { - float currentOverScroll = mNotificationStackScroller.getCurrentOverScrolledPixels(true); - float expansionChange = overExpansion - mOverExpansion; - expansionChange *= EXPANSION_RUBBER_BAND_EXTRA_FACTOR; - mNotificationStackScroller.setOverScrolledPixels(currentOverScroll + expansionChange, - true /* onTop */, - false /* animate */); - super.onOverExpansionChanged(overExpansion); + if (mStatusBar.getBarState() != StatusBarState.KEYGUARD) { + float currentOverScroll = mNotificationStackScroller.getCurrentOverScrolledPixels(true); + float expansionChange = overExpansion - mOverExpansion; + expansionChange *= EXPANSION_RUBBER_BAND_EXTRA_FACTOR; + mNotificationStackScroller.setOverScrolledPixels(currentOverScroll + expansionChange, + true /* onTop */, + false /* animate */); + } } @Override @@ -835,7 +830,6 @@ public class NotificationPanelView extends PanelView implements @Override protected void onTrackingStopped(boolean expand) { super.onTrackingStopped(expand); - mOverExpansion = 0.0f; mNotificationStackScroller.setOverScrolledPixels(0.0f, true /* onTop */, true /* animate */); if (expand && (mStatusBar.getBarState() == StatusBarState.KEYGUARD || mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED)) { @@ -860,8 +854,7 @@ public class NotificationPanelView extends PanelView implements @Override public void onScrollChanged() { if (mQsExpanded) { - mNotificationStackScroller.setTranslationY( - mNotificationTranslation - mScrollView.getScrollY()); + requestScrollerTopPaddingUpdate(false /* animate */); } } 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 f43f348..89a1907 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -53,7 +53,7 @@ public abstract class PanelView extends FrameLayout { private int mEdgeTapAreaWidth; private float mInitialOffsetOnTouch; private float mExpandedFraction = 0; - private float mExpandedHeight = 0; + protected float mExpandedHeight = 0; private boolean mJustPeeked; private boolean mClosing; protected boolean mTracking; @@ -162,7 +162,7 @@ public abstract class PanelView extends FrameLayout { if (mHeightAnimator != null) { mHeightAnimator.cancel(); // end any outstanding animations } - mTouchSlopExceeded = true; + mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning); onTrackingStarted(); } if (mExpandedHeight == 0) { @@ -219,7 +219,8 @@ public abstract class PanelView extends FrameLayout { case MotionEvent.ACTION_CANCEL: mTrackingPointer = -1; trackMovement(event); - if (mTracking && mTouchSlopExceeded) { + if ((mTracking && mTouchSlopExceeded) + || event.getActionMasked() == MotionEvent.ACTION_CANCEL) { float vel = getCurrentVelocity(); boolean expand = flingExpands(vel); onTrackingStopped(expand); @@ -369,8 +370,10 @@ public abstract class PanelView extends FrameLayout { protected void fling(float vel, boolean expand) { cancelPeek(); float target = expand ? getMaxPanelHeight() : 0.0f; - if (target == mExpandedHeight) { + if (target == mExpandedHeight || mOverExpansion > 0) { onExpandingFinished(); + mExpandedHeight = target; + mOverExpansion = 0.0f; mBar.panelExpansionChanged(this, mExpandedFraction); return; } @@ -459,6 +462,7 @@ public abstract class PanelView extends FrameLayout { overExpansion = Math.max(0, overExpansion); if (overExpansion != mOverExpansion) { onOverExpansionChanged(overExpansion); + mOverExpansion = overExpansion; } if (DEBUG) { @@ -469,9 +473,7 @@ public abstract class PanelView extends FrameLayout { mExpandedFraction = Math.min(1f, (fh == 0) ? 0 : mExpandedHeight / fh); } - protected void onOverExpansionChanged(float overExpansion) { - mOverExpansion = overExpansion; - } + protected abstract void onOverExpansionChanged(float overExpansion); protected abstract void onHeightUpdated(float expandedHeight); @@ -637,10 +639,12 @@ public abstract class PanelView extends FrameLayout { if (mHintAnimationRunning) { return true; } - if (x < mEdgeTapAreaWidth) { + if (x < mEdgeTapAreaWidth + && mStatusBar.getBarState() == StatusBarState.KEYGUARD) { onEdgeClicked(false /* right */); return true; - } else if (x > getWidth() - mEdgeTapAreaWidth) { + } else if (x > getWidth() - mEdgeTapAreaWidth + && mStatusBar.getBarState() == StatusBarState.KEYGUARD) { onEdgeClicked(true /* right */); return true; } else { @@ -654,7 +658,7 @@ public abstract class PanelView extends FrameLayout { startUnlockHintAnimation(); return true; case StatusBarState.SHADE_LOCKED: - // TODO: Go to Keyguard again. + mStatusBar.goToKeyguard(); return true; case StatusBarState.SHADE: collapse(); 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 082fe3a..e55de94 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -105,6 +105,7 @@ import com.android.systemui.statusbar.DragDownHelper; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.GestureRecorder; import com.android.systemui.statusbar.InterceptedNotifications; +import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.NotificationData.Entry; import com.android.systemui.statusbar.NotificationOverflowContainer; @@ -122,7 +123,6 @@ import com.android.systemui.statusbar.policy.LocationControllerImpl; import com.android.systemui.statusbar.policy.NetworkControllerImpl; import com.android.systemui.statusbar.policy.RotationLockControllerImpl; import com.android.systemui.statusbar.policy.ZenModeController; -import com.android.systemui.statusbar.policy.ZenModeControllerImpl; import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; import com.android.systemui.statusbar.stack.NotificationStackScrollLayout.OnChildLocationsChangedListener; import com.android.systemui.statusbar.stack.StackScrollState.ViewState; @@ -253,10 +253,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, View mKeyguardStatusView; KeyguardBottomAreaView mKeyguardBottomArea; boolean mLeaveOpenOnKeyguardHide; - KeyguardIndicationTextView mKeyguardIndicationTextView; + KeyguardIndicationController mKeyguardIndicationController; - // TODO: Fetch phrase from search/hotword provider. - String mKeyguardHotwordPhrase = ""; int mKeyguardMaxNotificationCount; View mDateTimeView; @@ -496,13 +494,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } }; - private final Runnable mResetIndicationRunnable = new Runnable() { - @Override - public void run() { - mKeyguardIndicationTextView.switchIndication(mKeyguardHotwordPhrase); - } - }; - @Override public void setZenMode(int mode) { super.setZenMode(mode); @@ -674,8 +665,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mKeyguardBottomArea = (KeyguardBottomAreaView) mStatusBarWindow.findViewById(R.id.keyguard_bottom_area); mKeyguardBottomArea.setActivityStarter(this); - mKeyguardIndicationTextView = (KeyguardIndicationTextView) mStatusBarWindow.findViewById( - R.id.keyguard_indication_text); + mKeyguardIndicationController = new KeyguardIndicationController(mContext, + (KeyguardIndicationTextView) mStatusBarWindow.findViewById( + R.id.keyguard_indication_text)); mDateView = (DateView)mStatusBarWindow.findViewById(R.id.date); mDateTimeView = mHeader.findViewById(R.id.datetime); @@ -2866,12 +2858,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private void updateKeyguardState() { if (mState == StatusBarState.KEYGUARD) { mKeyguardStatusView.setVisibility(View.VISIBLE); - mKeyguardIndicationTextView.setVisibility(View.VISIBLE); - mKeyguardIndicationTextView.switchIndication(mKeyguardHotwordPhrase); + mKeyguardIndicationController.setVisible(true); mNotificationPanel.resetViews(); } else { mKeyguardStatusView.setVisibility(View.GONE); - mKeyguardIndicationTextView.setVisibility(View.GONE); + mKeyguardIndicationController.setVisible(false); } if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { mKeyguardBottomArea.setVisibility(View.VISIBLE); @@ -2894,9 +2885,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, public void updateStackScrollerState() { if (mStackScroller == null) return; - mStackScroller.setDimmed(mState == StatusBarState.KEYGUARD, false /* animate */); - mStackScroller.setVisibility(!mShowLockscreenNotifications && mState == StatusBarState.KEYGUARD + boolean onKeyguard = mState == StatusBarState.KEYGUARD; + mStackScroller.setDimmed(onKeyguard, false /* animate */); + mStackScroller.setVisibility(!mShowLockscreenNotifications && onKeyguard ? View.INVISIBLE : View.VISIBLE); + mStackScroller.setScrollingEnabled(!onKeyguard); + mStackScroller.setExpandingEnabled(!onKeyguard); } public void userActivity() { @@ -2955,7 +2949,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void onActivated(View view) { userActivity(); - mKeyguardIndicationTextView.switchIndication(R.string.notification_tap_again); + mKeyguardIndicationController.showTransientIndication(R.string.notification_tap_again); mStackScroller.setActivatedChild(view); } @@ -2970,7 +2964,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void onActivationReset(View view) { if (view == mStackScroller.getActivatedChild()) { - mKeyguardIndicationTextView.switchIndication(mKeyguardHotwordPhrase); + mKeyguardIndicationController.hideTransientIndication(); mStackScroller.setActivatedChild(null); } } @@ -2979,24 +2973,20 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } public void onUnlockHintStarted() { - mStatusBarView.removeCallbacks(mResetIndicationRunnable); - mKeyguardIndicationTextView.switchIndication(R.string.keyguard_unlock); + mKeyguardIndicationController.showTransientIndication(R.string.keyguard_unlock); } public void onHintFinished() { - // Delay the reset a bit so the user can read the text. - mStatusBarView.postDelayed(mResetIndicationRunnable, HINT_RESET_DELAY_MS); + mKeyguardIndicationController.hideTransientIndicationDelayed(HINT_RESET_DELAY_MS); } public void onCameraHintStarted() { - mStatusBarView.removeCallbacks(mResetIndicationRunnable); - mKeyguardIndicationTextView.switchIndication(R.string.camera_hint); + mKeyguardIndicationController.showTransientIndication(R.string.camera_hint); } public void onPhoneHintStarted() { - mStatusBarView.removeCallbacks(mResetIndicationRunnable); - mKeyguardIndicationTextView.switchIndication(R.string.phone_hint); + mKeyguardIndicationController.showTransientIndication(R.string.phone_hint); } public void onTrackingStopped(boolean expand) { @@ -3032,6 +3022,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mStackScroller.setDimmed(false /* dimmed */, true /* animate */); } + @Override + public void onTouchSlopExceeded() { + mStackScroller.removeLongPressCallback(); + } + /** * If secure with redaction: Show bouncer, go to unlocked shade. * @@ -3055,6 +3050,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } /** + * Goes back to the keyguard after hanging around in {@link StatusBarState#SHADE_LOCKED}. + */ + public void goToKeyguard() { + if (mState == StatusBarState.SHADE_LOCKED) { + setBarState(StatusBarState.KEYGUARD); + updateKeyguardState(); + } + } + + /** * @return a ViewGroup that spans the entire panel which contains the quick settings */ public ViewGroup getQuickSettingsOverlayParent() { 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 b51626d..d5e8e8c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -40,7 +40,6 @@ public class StatusBarWindowView extends FrameLayout { public static final String TAG = "StatusBarWindowView"; public static final boolean DEBUG = BaseStatusBar.DEBUG; - private ExpandHelper mExpandHelper; private DragDownHelper mDragDownHelper; private NotificationStackScrollLayout mStackScrollLayout; private NotificationPanelView mNotificationPanel; @@ -73,12 +72,6 @@ public class StatusBarWindowView extends FrameLayout { mStackScrollLayout = (NotificationStackScrollLayout) findViewById( R.id.notification_stack_scroller); mNotificationPanel = (NotificationPanelView) findViewById(R.id.notification_panel); - int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height); - int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height); - mExpandHelper = new ExpandHelper(getContext(), mStackScrollLayout, - minHeight, maxHeight); - mExpandHelper.setEventSource(this); - mExpandHelper.setScrollAdapter(mStackScrollLayout); mDragDownHelper = new DragDownHelper(getContext(), this, mStackScrollLayout, mService); // We really need to be able to animate while window animations are going on @@ -114,12 +107,6 @@ public class StatusBarWindowView extends FrameLayout { boolean intercept = false; if (mNotificationPanel.isFullyExpanded() && mStackScrollLayout.getVisibility() == View.VISIBLE - && (mService.getBarState() == StatusBarState.SHADE - || (mService.getBarState() == StatusBarState.SHADE_LOCKED - && !mService.isBouncerShowing()))) { - intercept = mExpandHelper.onInterceptTouchEvent(ev); - } else if (mNotificationPanel.isFullyExpanded() - && mStackScrollLayout.getVisibility() == View.VISIBLE && mService.getBarState() == StatusBarState.KEYGUARD && !mService.isBouncerShowing()) { intercept = mDragDownHelper.onInterceptTouchEvent(ev); @@ -139,10 +126,7 @@ public class StatusBarWindowView extends FrameLayout { @Override public boolean onTouchEvent(MotionEvent ev) { boolean handled = false; - if (mNotificationPanel.isFullyExpanded() - && mService.getBarState() != StatusBarState.KEYGUARD) { - handled = mExpandHelper.onTouchEvent(ev); - } else if (mService.getBarState() == StatusBarState.KEYGUARD) { + if (mService.getBarState() == StatusBarState.KEYGUARD) { handled = mDragDownHelper.onTouchEvent(ev); } if (!handled) { @@ -168,8 +152,8 @@ public class StatusBarWindowView extends FrameLayout { } public void cancelExpandHelper() { - if (mExpandHelper != null) { - mExpandHelper.cancel(); + if (mStackScrollLayout != null) { + mStackScrollLayout.cancelExpandHelper(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java index ac26da2..df01c12 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java @@ -225,6 +225,11 @@ public class HeadsUpNotificationView extends FrameLayout implements SwipeHelper. } } + @Override + public void expansionStateChanged(boolean isExpanding) { + + } + // SwipeHelper.Callback methods @Override 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 5c98d51..c29f105 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -30,7 +30,6 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.animation.AnimationUtils; import android.widget.OverScroller; - import com.android.systemui.ExpandHelper; import com.android.systemui.R; import com.android.systemui.SwipeHelper; @@ -51,13 +50,15 @@ public class NotificationStackScrollLayout extends ViewGroup private static final String TAG = "NotificationStackScrollLayout"; private static final boolean DEBUG = false; - private static final float RUBBER_BAND_FACTOR = 0.35f; + private static final float RUBBER_BAND_FACTOR_NORMAL = 0.35f; + private static final float RUBBER_BAND_FACTOR_AFTER_EXPAND = 0.15f; /** * Sentinel value for no current active pointer. Used by {@link #mActivePointerId}. */ private static final int INVALID_POINTER = -1; + private ExpandHelper mExpandHelper; private SwipeHelper mSwipeHelper; private boolean mSwipingInProgress; private int mCurrentStackHeight = Integer.MAX_VALUE; @@ -73,6 +74,7 @@ public class NotificationStackScrollLayout extends ViewGroup private float mMaxOverScroll; private boolean mIsBeingDragged; private int mLastMotionY; + private int mDownX; private int mActivePointerId; private int mSidePaddings; @@ -128,6 +130,39 @@ public class NotificationStackScrollLayout extends ViewGroup private boolean mChildrenUpdateRequested; private SpeedBumpView mSpeedBumpView; private boolean mIsExpansionChanging; + private boolean mExpandingNotification; + private boolean mExpandedInThisMotion; + private boolean mScrollingEnabled; + + /** + * Was the scroller scrolled to the top when the down motion was observed? + */ + private boolean mScrolledToTopOnFirstDown; + + /** + * The minimal amount of over scroll which is needed in order to switch to the quick settings + * when over scrolling on a expanded card. + */ + private float mMinTopOverScrollToEscape; + private int mIntrinsicPadding; + private int mNotificationTopPadding; + private int mMinStackHeight; + private boolean mDontReportNextOverScroll; + + /** + * The maximum scrollPosition which we are allowed to reach when a notification was expanded. + * This is needed to avoid scrolling too far after the notification was collapsed in the same + * motion. + */ + private int mMaxScrollAfterExpand; + private OnLongClickListener mLongClickListener; + + /** + * Should in this touch motion only be scrolling allowed? It's true when the scroller was + * animating. + */ + private boolean mOnlyScrollingInThisMotion; + private boolean mTouchEnabled = true; private ViewTreeObserver.OnPreDrawListener mChildrenUpdater = new ViewTreeObserver.OnPreDrawListener() { @Override @@ -194,6 +229,7 @@ public class NotificationStackScrollLayout extends ViewGroup float densityScale = getResources().getDisplayMetrics().density; float pagingTouchSlop = ViewConfiguration.get(getContext()).getScaledPagingTouchSlop(); mSwipeHelper = new SwipeHelper(SwipeHelper.X, this, densityScale, pagingTouchSlop); + mSwipeHelper.setLongPressListener(mLongClickListener); mSidePaddings = context.getResources() .getDimensionPixelSize(R.dimen.notification_side_padding); @@ -207,6 +243,17 @@ public class NotificationStackScrollLayout extends ViewGroup mPaddingBetweenElementsNormal = context.getResources() .getDimensionPixelSize(R.dimen.notification_padding); updatePadding(false); + 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( + R.dimen.notifications_top_padding); + mMinStackHeight = getResources().getDimensionPixelSize(R.dimen.collapsed_stack_height); } private void updatePadding(boolean dimmed) { @@ -343,7 +390,7 @@ public class NotificationStackScrollLayout extends ViewGroup return mTopPadding; } - public void setTopPadding(int topPadding, boolean animate) { + private void setTopPadding(int topPadding, boolean animate) { if (mTopPadding != topPadding) { mTopPadding = topPadding; updateAlgorithmHeightAndPadding(); @@ -414,6 +461,7 @@ public class NotificationStackScrollLayout extends ViewGroup public void setLongPressListener(View.OnLongClickListener listener) { mSwipeHelper.setLongPressListener(listener); + mLongClickListener = listener; } public void onChildDismissed(View v) { @@ -511,6 +559,29 @@ public class NotificationStackScrollLayout extends ViewGroup if (v instanceof ExpandableNotificationRow) { ((ExpandableNotificationRow) v).setUserLocked(userLocked); } + removeLongPressCallback(); + requestDisallowInterceptTouchEvent(true); + } + + @Override + public void expansionStateChanged(boolean isExpanding) { + mExpandingNotification = isExpanding; + if (!mExpandedInThisMotion) { + mMaxScrollAfterExpand = mOwnScrollY; + mExpandedInThisMotion = true; + } + } + + public void setScrollingEnabled(boolean enable) { + mScrollingEnabled = enable; + } + + public void setExpandingEnabled(boolean enable) { + mExpandHelper.setEnabled(enable); + } + + private boolean isScrollingEnabled() { + return mScrollingEnabled; } public View getChildContentView(View v) { @@ -548,18 +619,44 @@ public class NotificationStackScrollLayout extends ViewGroup if (!isEnabled()) { return false; } + boolean isCancelOrUp = ev.getActionMasked() == MotionEvent.ACTION_CANCEL + || ev.getActionMasked()== MotionEvent.ACTION_UP; + boolean expandWantsIt = false; + if (!mSwipingInProgress && !mOnlyScrollingInThisMotion) { + if (isCancelOrUp) { + mExpandHelper.onlyObserveMovements(false); + } + boolean wasExpandingBefore = mExpandingNotification; + expandWantsIt = mExpandHelper.onTouchEvent(ev); + if (mExpandedInThisMotion && !mExpandingNotification && wasExpandingBefore) { + dispatchDownEventToScroller(ev); + } + } boolean scrollerWantsIt = false; - if (!mSwipingInProgress) { + if (!mSwipingInProgress && !mExpandingNotification) { scrollerWantsIt = onScrollTouch(ev); } boolean horizontalSwipeWantsIt = false; - if (!mIsBeingDragged) { + if (!mIsBeingDragged + && !mExpandingNotification + && !mExpandedInThisMotion + && !mOnlyScrollingInThisMotion) { horizontalSwipeWantsIt = mSwipeHelper.onTouchEvent(ev); } - return horizontalSwipeWantsIt || scrollerWantsIt || super.onTouchEvent(ev); + return horizontalSwipeWantsIt || scrollerWantsIt || expandWantsIt || super.onTouchEvent(ev); + } + + private void dispatchDownEventToScroller(MotionEvent ev) { + MotionEvent downEvent = MotionEvent.obtain(ev); + downEvent.setAction(MotionEvent.ACTION_DOWN); + onScrollTouch(downEvent); + downEvent.recycle(); } private boolean onScrollTouch(MotionEvent ev) { + if (!isScrollingEnabled()) { + return false; + } initVelocityTrackerIfNotExists(); mVelocityTracker.addMovement(ev); @@ -583,6 +680,7 @@ public class NotificationStackScrollLayout extends ViewGroup // Remember where the motion event started mLastMotionY = (int) ev.getY(); + mDownX = (int) ev.getX(); mActivePointerId = ev.getPointerId(0); break; } @@ -594,8 +692,11 @@ public class NotificationStackScrollLayout extends ViewGroup } final int y = (int) ev.getY(activePointerIndex); + final int x = (int) ev.getX(activePointerIndex); int deltaY = mLastMotionY - y; - if (!mIsBeingDragged && Math.abs(deltaY) > mTouchSlop) { + final int xDiff = Math.abs(x - mDownX); + final int yDiff = Math.abs(deltaY); + if (!mIsBeingDragged && yDiff > mTouchSlop && yDiff > xDiff) { setIsBeingDragged(true); if (deltaY > 0) { deltaY -= mTouchSlop; @@ -606,7 +707,10 @@ public class NotificationStackScrollLayout extends ViewGroup if (mIsBeingDragged) { // Scroll to follow the motion event mLastMotionY = y; - final int range = getScrollRange(); + int range = getScrollRange(); + if (mExpandedInThisMotion) { + range = Math.min(range, mMaxScrollAfterExpand); + } float scrollAmount; if (deltaY < 0) { @@ -631,19 +735,28 @@ public class NotificationStackScrollLayout extends ViewGroup velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); int initialVelocity = (int) velocityTracker.getYVelocity(mActivePointerId); - if (getChildCount() > 0) { - if ((Math.abs(initialVelocity) > mMinimumVelocity)) { - fling(-initialVelocity); - } else { - if (mScroller.springBack(mScrollX, mOwnScrollY, 0, 0, 0, - getScrollRange())) { - postInvalidateOnAnimation(); + if (shouldOverScrollFling(initialVelocity)) { + onOverScrollFling(true, initialVelocity); + } else { + if (getChildCount() > 0) { + if ((Math.abs(initialVelocity) > mMinimumVelocity)) { + float currentOverScrollTop = getCurrentOverScrollAmount(true); + if (currentOverScrollTop == 0.0f || initialVelocity > 0) { + fling(-initialVelocity); + } else { + onOverScrollFling(false, initialVelocity); + } + } else { + if (mScroller.springBack(mScrollX, mOwnScrollY, 0, 0, 0, + getScrollRange())) { + postInvalidateOnAnimation(); + } } } - } - mActivePointerId = INVALID_POINTER; - endDrag(); + mActivePointerId = INVALID_POINTER; + endDrag(); + } } break; case MotionEvent.ACTION_CANCEL: @@ -658,17 +771,27 @@ public class NotificationStackScrollLayout extends ViewGroup case MotionEvent.ACTION_POINTER_DOWN: { final int index = ev.getActionIndex(); mLastMotionY = (int) ev.getY(index); + mDownX = (int) ev.getX(index); mActivePointerId = ev.getPointerId(index); break; } case MotionEvent.ACTION_POINTER_UP: onSecondaryPointerUp(ev); mLastMotionY = (int) ev.getY(ev.findPointerIndex(mActivePointerId)); + mDownX = (int) ev.getX(ev.findPointerIndex(mActivePointerId)); break; } return true; } + private void onOverScrollFling(boolean open, int initialVelocity) { + if (mOverscrollTopChangedListener != null) { + mOverscrollTopChangedListener.flingTopOverscroll(initialVelocity, open); + } + mDontReportNextOverScroll = true; + setOverScrollAmount(0.0f, true, false); + } + /** * Perform a scroll upwards and adapt the overscroll amounts accordingly * @@ -689,11 +812,13 @@ public class NotificationStackScrollLayout extends ViewGroup float scrollAmount = newTopAmount < 0 ? -newTopAmount : 0.0f; float newScrollY = mOwnScrollY + scrollAmount; if (newScrollY > range) { - float currentBottomPixels = getCurrentOverScrolledPixels(false); - // We overScroll on the top - setOverScrolledPixels(currentBottomPixels + newScrollY - range, - false /* onTop */, - false /* animate */); + if (!mExpandedInThisMotion) { + float currentBottomPixels = getCurrentOverScrolledPixels(false); + // We overScroll on the top + setOverScrolledPixels(currentBottomPixels + newScrollY - range, + false /* onTop */, + false /* animate */); + } mOwnScrollY = range; scrollAmount = 0.0f; } @@ -834,7 +959,7 @@ public class NotificationStackScrollLayout extends ViewGroup * @param animate Should an animation be performed. */ public void setOverScrolledPixels(float numPixels, boolean onTop, boolean animate) { - setOverScrollAmount(numPixels * RUBBER_BAND_FACTOR, onTop, animate, true); + setOverScrollAmount(numPixels * getRubberBandFactor(), onTop, animate, true); } /** @@ -870,17 +995,21 @@ public class NotificationStackScrollLayout extends ViewGroup if (animate) { mStateAnimator.animateOverScrollToAmount(amount, onTop); } else { - setOverScrolledPixels(amount / RUBBER_BAND_FACTOR, onTop); + setOverScrolledPixels(amount / getRubberBandFactor(), onTop); mAmbientState.setOverScrollAmount(amount, onTop); - requestChildrenUpdate(); if (onTop) { - float scrollAmount = mOwnScrollY < 0 ? -mOwnScrollY : 0; - notifyOverscrollTopListener(scrollAmount + amount); + notifyOverscrollTopListener(amount); } + requestChildrenUpdate(); } } private void notifyOverscrollTopListener(float amount) { + mExpandHelper.onlyObserveMovements(amount > 1.0f); + if (mDontReportNextOverScroll) { + mDontReportNextOverScroll = false; + return; + } if (mOverscrollTopChangedListener != null) { mOverscrollTopChangedListener.onOverscrollTopChanged(amount); } @@ -928,7 +1057,7 @@ public class NotificationStackScrollLayout extends ViewGroup updateChildren(); float overScrollTop = getCurrentOverScrollAmount(true); if (mOwnScrollY < 0) { - notifyOverscrollTopListener(-mOwnScrollY + overScrollTop); + notifyOverscrollTopListener(-mOwnScrollY); } else { notifyOverscrollTopListener(overScrollTop); } @@ -950,6 +1079,7 @@ public class NotificationStackScrollLayout extends ViewGroup onTop = true; newAmount = -mOwnScrollY; mOwnScrollY = 0; + mDontReportNextOverScroll = true; } else { onTop = false; newAmount = mOwnScrollY - scrollRange; @@ -1085,13 +1215,14 @@ public class NotificationStackScrollLayout extends ViewGroup float bottomAmount = getCurrentOverScrollAmount(false); if (velocityY < 0 && topAmount > 0) { mOwnScrollY -= (int) topAmount; + mDontReportNextOverScroll = true; setOverScrollAmount(0, true, false); - mMaxOverScroll = Math.abs(velocityY) / 1000f * RUBBER_BAND_FACTOR + mMaxOverScroll = Math.abs(velocityY) / 1000f * getRubberBandFactor() * mOverflingDistance + topAmount; } else if (velocityY > 0 && bottomAmount > 0) { mOwnScrollY += bottomAmount; setOverScrollAmount(0, false, false); - mMaxOverScroll = Math.abs(velocityY) / 1000f * RUBBER_BAND_FACTOR + mMaxOverScroll = Math.abs(velocityY) / 1000f * getRubberBandFactor() * mOverflingDistance + bottomAmount; } else { // it will be set once we reach the boundary @@ -1104,6 +1235,44 @@ public class NotificationStackScrollLayout extends ViewGroup } } + /** + * @return Whether a fling performed on the top overscroll edge lead to the expanded + * overScroll view (i.e QS). + */ + private boolean shouldOverScrollFling(int initialVelocity) { + float topOverScroll = getCurrentOverScrollAmount(true); + return mScrolledToTopOnFirstDown + && !mExpandedInThisMotion + && topOverScroll > mMinTopOverScrollToEscape + && initialVelocity > 0; + } + + public void updateTopPadding(float qsHeight, int scrollY, boolean animate) { + float start = qsHeight - scrollY + mNotificationTopPadding; + float stackHeight = getHeight() - start; + if (stackHeight <= mMinStackHeight) { + float overflow = mMinStackHeight - stackHeight; + stackHeight = mMinStackHeight; + start = getHeight() - stackHeight; + setTranslationY(overflow); + } else { + setTranslationY(0); + } + setTopPadding(clampPadding((int) start), animate); + } + + private int clampPadding(int desiredPadding) { + return Math.max(desiredPadding, mIntrinsicPadding); + } + + private float getRubberBandFactor() { + return mExpandedInThisMotion + ? RUBBER_BAND_FACTOR_AFTER_EXPAND + : (mScrolledToTopOnFirstDown + ? 1.0f + : RUBBER_BAND_FACTOR_NORMAL); + } + private void endDrag() { setIsBeingDragged(false); @@ -1119,16 +1288,30 @@ public class NotificationStackScrollLayout extends ViewGroup @Override public boolean onInterceptTouchEvent(MotionEvent ev) { + initDownStates(ev); + boolean expandWantsIt = false; + if (!mSwipingInProgress && !mOnlyScrollingInThisMotion) { + expandWantsIt = mExpandHelper.onInterceptTouchEvent(ev); + } boolean scrollWantsIt = false; - if (!mSwipingInProgress) { + if (!mSwipingInProgress && !mExpandingNotification) { scrollWantsIt = onInterceptTouchEventScroll(ev); } boolean swipeWantsIt = false; - if (!mIsBeingDragged) { + if (!mIsBeingDragged + && !mExpandingNotification + && !mExpandedInThisMotion + && !mOnlyScrollingInThisMotion) { swipeWantsIt = mSwipeHelper.onInterceptTouchEvent(ev); } - return swipeWantsIt || scrollWantsIt || - super.onInterceptTouchEvent(ev); + return swipeWantsIt || scrollWantsIt || expandWantsIt || super.onInterceptTouchEvent(ev); + } + + private void initDownStates(MotionEvent ev) { + if (ev.getAction() == MotionEvent.ACTION_DOWN) { + mExpandedInThisMotion = false; + mOnlyScrollingInThisMotion = !mScroller.isFinished(); + } } @Override @@ -1350,6 +1533,9 @@ public class NotificationStackScrollLayout extends ViewGroup } private boolean onInterceptTouchEventScroll(MotionEvent ev) { + if (!isScrollingEnabled()) { + return false; + } /* * This method JUST determines whether we want to intercept the motion. * If we return true, onMotionEvent will be called and we do the actual @@ -1366,13 +1552,6 @@ public class NotificationStackScrollLayout extends ViewGroup return true; } - /* - * Don't try to intercept touch if we can't scroll anyway. - */ - if (mOwnScrollY == 0 && getScrollRange() == 0) { - return false; - } - switch (action & MotionEvent.ACTION_MASK) { case MotionEvent.ACTION_MOVE: { /* @@ -1398,10 +1577,13 @@ public class NotificationStackScrollLayout extends ViewGroup } final int y = (int) ev.getY(pointerIndex); + final int x = (int) ev.getX(pointerIndex); final int yDiff = Math.abs(y - mLastMotionY); - if (yDiff > mTouchSlop) { + final int xDiff = Math.abs(x - mDownX); + if (yDiff > mTouchSlop && yDiff > xDiff) { setIsBeingDragged(true); mLastMotionY = y; + mDownX = x; initVelocityTrackerIfNotExists(); mVelocityTracker.addMovement(ev); } @@ -1421,7 +1603,9 @@ public class NotificationStackScrollLayout extends ViewGroup * ACTION_DOWN always refers to pointer index 0. */ mLastMotionY = y; + mDownX = (int) ev.getX(); mActivePointerId = ev.getPointerId(0); + mScrolledToTopOnFirstDown = isScrolledToTop(); initOrResetVelocityTracker(); mVelocityTracker.addMovement(ev); @@ -1468,7 +1652,7 @@ public class NotificationStackScrollLayout extends ViewGroup mIsBeingDragged = isDragged; if (isDragged) { requestDisallowInterceptTouchEvent(true); - mSwipeHelper.removeLongPressCallback(); + removeLongPressCallback(); } } @@ -1476,10 +1660,14 @@ public class NotificationStackScrollLayout extends ViewGroup public void onWindowFocusChanged(boolean hasWindowFocus) { super.onWindowFocusChanged(hasWindowFocus); if (!hasWindowFocus) { - mSwipeHelper.removeLongPressCallback(); + removeLongPressCallback(); } } + public void removeLongPressCallback() { + mSwipeHelper.removeLongPressCallback(); + } + @Override public boolean isScrolledToTop() { return mOwnScrollY == 0; @@ -1608,6 +1796,14 @@ public class NotificationStackScrollLayout extends ViewGroup updateSpeedBump(true); } + public void cancelExpandHelper() { + mExpandHelper.cancel(); + } + + public void setIntrinsicPadding(int intrinsicPadding) { + mIntrinsicPadding = intrinsicPadding; + } + /** * @return the y position of the first notification */ @@ -1615,6 +1811,18 @@ public class NotificationStackScrollLayout extends ViewGroup return mTopPadding + getTranslationY(); } + public void setTouchEnabled(boolean touchEnabled) { + mTouchEnabled = touchEnabled; + } + + @Override + public boolean dispatchTouchEvent(MotionEvent ev) { + if (!mTouchEnabled) { + return false; + } + return super.dispatchTouchEvent(ev); + } + /** * A listener that is notified when some child locations might have changed. */ @@ -1627,6 +1835,15 @@ public class NotificationStackScrollLayout extends ViewGroup */ public interface OnOverscrollTopChangedListener { public void onOverscrollTopChanged(float amount); + + /** + * Notify a listener that the scroller wants to escape from the scrolling motion and + * start a fling animation to the expanded or collapsed overscroll view (e.g expand the QS) + * + * @param velocity The velocity that the Scroller had when over flinging + * @param open Should the fling open or close the overscroll view. + */ + public void flingTopOverscroll(float velocity, boolean open); } static class AnimationEvent { 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 2b52c7e..a48cab8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java @@ -131,10 +131,14 @@ public class StackScrollAlgorithm { algorithmState.scrolledPixelsTop = 0; algorithmState.itemsInBottomStack = 0.0f; algorithmState.partialInBottom = 0.0f; - float topOverScroll = ambientState.getOverScrollAmount(true /* onTop */); float bottomOverScroll = ambientState.getOverScrollAmount(false /* onTop */); - algorithmState.scrollY = (int) (ambientState.getScrollY() + mCollapsedSize - + bottomOverScroll - topOverScroll); + + int scrollY = ambientState.getScrollY(); + + // Due to the overScroller, the stackscroller can have negative scroll state. This is + // already accounted for by the top padding and doesn't need an additional adaption + scrollY = Math.max(0, scrollY); + algorithmState.scrollY = (int) (scrollY + mCollapsedSize + bottomOverScroll); updateVisibleChildren(resultState, algorithmState); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 2eee853..a8645bc 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -46,6 +46,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; +import android.content.res.Resources.Theme; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; @@ -213,7 +214,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { private int mTitleColor = 0; private boolean mAlwaysReadCloseOnTouchAttr = false; - + private ContextMenuBuilder mContextMenu; private MenuDialogHelper mContextMenuHelper; private boolean mClosingActionMenu; @@ -475,7 +476,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (st.isPrepared) { return true; } - + if ((mPreparedPanel != null) && (mPreparedPanel != st)) { // Another Panel is prepared and possibly open, so close it closePanel(mPreparedPanel, false); @@ -528,7 +529,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { return false; } - + st.refreshMenuContent = false; } @@ -620,7 +621,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { // Causes the decor view to be recreated st.refreshDecorView = true; - + st.clearMenuPresenters(); } @@ -872,7 +873,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } st.refreshMenuContent = true; st.refreshDecorView = true; - + // Prepare the options panel if we have an action bar if ((featureId == FEATURE_ACTION_BAR || featureId == FEATURE_OPTIONS_PANEL) && mDecorContentParent != null) { @@ -883,7 +884,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } } } - + /** * Called when the panel key is pushed down. * @param featureId The feature ID of the relevant panel (defaults to FEATURE_OPTIONS_PANEL}. @@ -892,7 +893,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { */ public final boolean onKeyDownPanel(int featureId, KeyEvent event) { final int keyCode = event.getKeyCode(); - + if (event.getRepeatCount() == 0) { // The panel key was pushed, so set the chording key mPanelChordingKey = keyCode; @@ -919,7 +920,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (event.isCanceled() || (mDecor != null && mDecor.mActionMode != null)) { return; } - + boolean playSoundEffect = false; final PanelFeatureState st = getPanelState(featureId, true); if (featureId == FEATURE_OPTIONS_PANEL && mDecorContentParent != null && @@ -1159,22 +1160,40 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { protected boolean initializePanelMenu(final PanelFeatureState st) { Context context = getContext(); - // If we have an action bar, initialize the menu with a context themed for it. + // If we have an action bar, initialize the menu with the right theme. if ((st.featureId == FEATURE_OPTIONS_PANEL || st.featureId == FEATURE_ACTION_BAR) && mDecorContentParent != null) { - TypedValue outValue = new TypedValue(); - Resources.Theme currentTheme = context.getTheme(); - currentTheme.resolveAttribute(com.android.internal.R.attr.actionBarWidgetTheme, - outValue, true); - final int targetThemeRes = outValue.resourceId; + final TypedValue outValue = new TypedValue(); + final Theme baseTheme = context.getTheme(); + baseTheme.resolveAttribute(com.android.internal.R.attr.actionBarTheme, outValue, true); + + Theme widgetTheme = null; + if (outValue.resourceId != 0) { + widgetTheme = context.getResources().newTheme(); + widgetTheme.setTo(baseTheme); + widgetTheme.applyStyle(outValue.resourceId, true); + widgetTheme.resolveAttribute( + com.android.internal.R.attr.actionBarWidgetTheme, outValue, true); + } else { + baseTheme.resolveAttribute( + com.android.internal.R.attr.actionBarWidgetTheme, outValue, true); + } - if (targetThemeRes != 0 && context.getThemeResId() != targetThemeRes) { - context = new ContextThemeWrapper(context, targetThemeRes); + if (outValue.resourceId != 0) { + if (widgetTheme == null) { + widgetTheme = context.getResources().newTheme(); + widgetTheme.setTo(baseTheme); + } + widgetTheme.applyStyle(outValue.resourceId, true); + } + + if (widgetTheme != null) { + context = new ContextThemeWrapper(context, 0); + context.getTheme().setTo(widgetTheme); } } final MenuBuilder menu = new MenuBuilder(context); - menu.setCallback(this); st.setMenu(menu); @@ -1665,7 +1684,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { mDecor != null ? mDecor.getKeyDispatcherState() : null; //Log.i(TAG, "Key down: repeat=" + event.getRepeatCount() // + " flags=0x" + Integer.toHexString(event.getFlags())); - + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: @@ -1727,7 +1746,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } //Log.i(TAG, "Key up: repeat=" + event.getRepeatCount() // + " flags=0x" + Integer.toHexString(event.getFlags())); - + switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_DOWN: @@ -2278,7 +2297,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (!AccessibilityManager.getInstance(mContext).isEnabled()) { return; } - + // if we are showing a feature that should be announced and one child // make this child the event source since this is the feature itself // otherwise the callback will take over and announce its client @@ -2829,13 +2848,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { hackTurnOffWindowResizeAnim(bg == null || bg.getOpacity() != PixelFormat.OPAQUE); } - + @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - + updateWindowResizeState(); - + final Callback cb = getCallback(); if (cb != null && !isDestroyed() && mFeatureId < 0) { cb.onAttachedToWindow(); @@ -2856,7 +2875,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - + final Callback cb = getCallback(); if (cb != null && mFeatureId < 0) { cb.onDetachedFromWindow(); @@ -2890,19 +2909,19 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { public android.view.SurfaceHolder.Callback2 willYouTakeTheSurface() { return mFeatureId < 0 ? mTakeSurfaceCallback : null; } - + public InputQueue.Callback willYouTakeTheInputQueue() { return mFeatureId < 0 ? mTakeInputQueueCallback : null; } - + public void setSurfaceType(int type) { PhoneWindow.this.setType(type); } - + public void setSurfaceFormat(int format) { PhoneWindow.this.setFormat(format); } - + public void setSurfaceKeepScreenOn(boolean keepOn) { if (keepOn) PhoneWindow.this.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); else PhoneWindow.this.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -3119,7 +3138,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { setCloseOnTouchOutsideIfNotSet(true); } } - + WindowManager.LayoutParams params = getAttributes(); if (!hasSoftInputMode()) { @@ -3897,11 +3916,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { boolean refreshDecorView; boolean refreshMenuContent; - + boolean wasLastOpen; - + boolean wasLastExpanded; - + /** * Contains the state of the menu when told to freeze. */ diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index b2b4217..abb8cc5 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1754,31 +1754,34 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (DBG) log("requestRouteToHostAddress on invalid network: " + networkType); return false; } - NetworkStateTracker tracker = mNetTrackers[networkType]; - DetailedState netState = DetailedState.DISCONNECTED; - if (tracker != null) { - netState = tracker.getNetworkInfo().getDetailedState(); + + NetworkAgentInfo nai = mLegacyTypeTracker.getNetworkForType(networkType); + if (nai == null) { + if (mLegacyTypeTracker.isTypeSupported(networkType) == false) { + if (DBG) log("requestRouteToHostAddress on unsupported network: " + networkType); + } else { + if (DBG) log("requestRouteToHostAddress on down network: " + networkType); + } + return false; } + DetailedState netState = nai.networkInfo.getDetailedState(); + if ((netState != DetailedState.CONNECTED && - netState != DetailedState.CAPTIVE_PORTAL_CHECK) || - tracker.isTeardownRequested()) { + netState != DetailedState.CAPTIVE_PORTAL_CHECK)) { if (VDBG) { log("requestRouteToHostAddress on down network " + "(" + networkType + ") - dropped" - + " tracker=" + tracker - + " netState=" + netState - + " isTeardownRequested=" - + ((tracker != null) ? tracker.isTeardownRequested() : "tracker:null")); + + " netState=" + netState); } return false; } final int uid = Binder.getCallingUid(); final long token = Binder.clearCallingIdentity(); try { - LinkProperties lp = tracker.getLinkProperties(); + LinkProperties lp = nai.linkProperties; boolean ok = modifyRouteToAddress(lp, addr, ADD, TO_DEFAULT_TABLE, exempt, - tracker.getNetwork().netId, uid); + nai.network.netId, uid); if (DBG) log("requestRouteToHostAddress ok=" + ok); return ok; } finally { @@ -3316,6 +3319,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (bestNetwork != null) { if (VDBG) log("using " + bestNetwork.name()); bestNetwork.addRequest(nri.request); + mNetworkForRequestId.put(nri.request.requestId, bestNetwork); int legacyType = nri.request.legacyType; if (legacyType != TYPE_NONE) { mLegacyTypeTracker.add(legacyType, bestNetwork); diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 986cdc1..462b234 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -49,6 +49,7 @@ import android.os.UserManager; import android.service.trust.TrustAgentService; import android.util.ArraySet; import android.util.AttributeSet; +import android.util.Log; import android.util.Slog; import android.util.SparseBooleanArray; import android.util.Xml; @@ -80,6 +81,7 @@ public class TrustManagerService extends SystemService { private static final Intent TRUST_AGENT_INTENT = new Intent(TrustAgentService.SERVICE_INTERFACE); + private static final String PERMISSION_PROVIDE_AGENT = Manifest.permission.PROVIDE_TRUST_AGENT; private static final int MSG_REGISTER_LISTENER = 1; private static final int MSG_UNREGISTER_LISTENER = 2; @@ -181,6 +183,15 @@ public class TrustManagerService extends SystemService { PackageManager.GET_META_DATA, userInfo.id); for (ResolveInfo resolveInfo : resolveInfos) { if (resolveInfo.serviceInfo == null) continue; + + String packageName = resolveInfo.serviceInfo.packageName; + if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName) + != PackageManager.PERMISSION_GRANTED) { + Log.w(TAG, "Skipping agent because package " + packageName + + " does not have permission " + PERMISSION_PROVIDE_AGENT + "."); + continue; + } + ComponentName name = getComponentName(resolveInfo); if (!enabledAgents.contains(name)) continue; |