summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib/res
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2017-04-286-93/+42
| | | | Change-Id: Ifeae1515729fc73ba3198e72b3479870092af3c1
* Automatic translation importAbhisek Devkota2017-02-196-4/+180
| | | | Change-Id: I80e32cc003cc9c8707732b27a683e87cdd67375d
* Automatic translation importAbhisek Devkota2017-01-2719-37/+1
| | | | Change-Id: Ib115f3813214bfffb935cf522d0e31e8c95be4de
* Automatic translation importblinky@build012016-12-2218-5/+41
| | | | | Change-Id: I251ee7b9d1508a91692a8a8c1ba863730fcf125b Ticket: -
* Automatic translation importblinky@build012016-12-211-1/+1
| | | | | Change-Id: Ic49d5ed34f92ca0298510b6ca8a3a279a0ea6e4d Ticket: -
* Automatic translation importclyde@build012016-12-2045-0/+945
| | | | | Change-Id: Icd3adceb4cfd523f56b7072934a037a203fd0b81 Ticket: -
* Automatic translation importclyde@build012016-12-161-0/+27
| | | | | Change-Id: I86e57b89e58d2cf5985e62b8d582f49285c265f3 Ticket: -
* Automatic translation importpinky@build012016-12-151-1/+1
| | | | | Change-Id: I53e8f93c43ddb93433c81d457e9721c0fff07b81 Ticket: -
* Automatic translation importinky@build012016-12-021-1/+1
| | | | | Change-Id: Ic80541e78c8570809868ce067a5176acb9d6a5a2 Ticket: -
* Automatic translation importpinky@build012016-09-272-0/+59
| | | | | Change-Id: I77a3c0eb997d6f2aaf9b1add59480c496e55e43d Ticket: -
* Automatic translation importpinky@build012016-08-278-1/+475
| | | | | Change-Id: If7eac9a9fa7e145c9d35ece91a8ccab33601a1ca Ticket: -
* Automatic translation importblinky@build012016-08-132-0/+34
| | | | | Change-Id: I599894bfd30ff9d78253482981737fc8a440a826 Ticket: -
* Port "Settings: add a way to not localize zone selections" to cm-13Luis Vidal2016-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In specific cases we may not want to display the localized time zone name in the time zone picker. For instance, when the system language is set to English (US), going into the time zone picker, we can find "London." After we set the system language to English (United Kingdom), London becomes localized to "British Summer Time." To avoid this behavior and to always display the unlocalized version of the time zone name, we can now set localizeInPicker="false" on the time zone entry desired to not be localized. Note that if a translation is available for the selected time zone, it will still be applied. In this patch we add this attribute to the Kiev time zone. In English this patch has no effect. However if the system language is changed to Ukranian and we select Kiev from the time zone picker: Without this patch: in the time zone picker it would use local time zone translations, e.g. "за схдноевропейським літнім часом" (Eastern European Summer Time). With this patch: it displays "Київ" in the time zone picker. But still displays the localized time zone in the Date & Time settings. Ref: CYNGNOS-453 (ported from commit c5aecaab60d353fcedd4579b9d94808be9838de2) Change-Id: I6302e5beb981786500f73629baa0751ac9e43e73
* Settings: add Kiev time zones to pickerLuis Vidal2016-05-171-0/+1
| | | | | | | | Ref: CYNGNOS-453 Change-Id: Id03ecbe612031400413da3efff20392ea9365a52 Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit c241e9aea37120a8284d28c6197c8e9d88046546)
* Automatic translation importAbhisek Devkota2016-05-172-0/+36
| | | | Change-Id: I3e905d33baa25bbbccffeb48dab1a53a22f6bc3a
* Automatic translation importAbhisek Devkota2016-05-142-0/+143
| | | | Change-Id: I3d1a3f5e5b488776048d0dbaac757ffb1e2f8e7b
* Automatic translation importMichael Bestas2016-05-101-0/+27
| | | | Change-Id: I1fc549efac54f6f67ac9384eaebbddf723f30192
* Fix revert build breakageStephen Bird2016-05-041-0/+30
| | | | Change-Id: I090dd9a112f930967ec76bfa6e19c2ac52e50a9a
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-04157-30/+10686
| | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
* Revert "SettingsLib: Add back accidentally removed translations"Michael Bestas2016-05-02156-10686/+0
| | | | | | This reverts commit 2c35c469fa343b499b55dddc37cd77d4ac0e26c5. Change-Id: I47daa01ed8f5a26ff5326750e6c55ff3bc4b93b3
* Automatic translation importMichael Bestas2016-04-164-1/+177
| | | | Change-Id: Ib87e41106982b159d249ebbe0653e569f9c7b454
* SettingsLib: Add back accidentally removed translationsMichael Bestas2016-04-15156-0/+10686
| | | | | | * These were removed in r22 merge Change-Id: I1e0b4e910b8a9a86733be4b66516a003115a6c45
* Automatic translation importMichael Bestas2016-04-063-1/+150
| | | | Change-Id: I3849e73aee18720b20529d406c7657c0a0cee320
* Automatic translation importMichael Bestas2016-03-287-1/+353
| | | | Change-Id: Ib371d8f862dced4aa36cfe076f876e9ae4bd62c2
* Automatic translation importMichael Bestas2016-03-1842-1/+2317
| | | | Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-11158-10687/+33
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib.Wei Liu2015-08-252-1/+33
| |\ | | | | | | | | | | | | * commit '30275c1924b2bd45b05bd9c98f8648ecbc71374f': Refactor UidDetailProvider and its dependencies to SettingsLib.
| | * Refactor UidDetailProvider and its dependencies to SettingsLib.Wei Liu2015-08-252-1/+33
| | | | | | | | | | | | | | | | | | so that it can be reused by Wear app data usage. Change-Id: Ifd5709647ba031bb38b2293c35def01bcdee1448
| * | am b9b50eff: am a7542155: am 2061049d: Merge "Move wifi accessibility ↵Jason Monk2015-07-141-0/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | strings to SettingsLib" into mnc-dev * commit 'b9b50effa1ddd66c999e25af1f8bf2e2a9c07566': Move wifi accessibility strings to SettingsLib
| | * am a7542155: am 2061049d: Merge "Move wifi accessibility strings to ↵Jason Monk2015-07-141-0/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | SettingsLib" into mnc-dev * commit 'a75421557651d7016124f8ed1fa5c0bab834d121': Move wifi accessibility strings to SettingsLib
| * | \ am 7bcacc9c: Merge "Animations/success state for external confirm device ↵Jorim Jaggi2015-06-111-0/+24
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | credentials (1/2)" into mnc-dev * commit '7bcacc9c6af19e429bc3681b1559844e5b8fa1ba': Animations/success state for external confirm device credentials (1/2)
* | | | Automatic translation importMichael Bestas2016-02-221-2/+2
| | | | | | | | | | | | | | | | Change-Id: I2c344fc6bdb50744e98cfa53c89b336aabf91421
* | | | Automatic translation importMichael Bestas2016-02-142-1/+28
| | | | | | | | | | | | | | | | Change-Id: I6f7e9a4d7d72272d445319a26b386d7098aa26a4
* | | | Automatic translation importMichael Bestas2016-02-025-0/+135
| | | | | | | | | | | | | | | | Change-Id: Ie1df95cca921e390acd820750e74dbaddfabf9c2
* | | | Automatic translation importMichael Bestas2016-01-2521-0/+566
| | | | | | | | | | | | | | | | Change-Id: Ia54785f241d7597cc76d2531c6be53263f5949c1
* | | | Settings: Fix bluetooth phone icon disappear in Settings/Bluetooth.Tianfu Yu2016-01-233-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ic_bt_cellphone icon color in ldrtl folder is white, it cannot be seen in white background. Modify ic_bt_cellphone icon color to green to be consistent with the icon color in normal folder. CRs-Fixed: 953015 Change-Id: I16ee4a7d485f594e817623fa4699c9e332d28e61
* | | | Automatic translation importMichael Bestas2016-01-116-0/+162
| | | | | | | | | | | | | | | | Change-Id: Icca32de2d5cfed0c6d211a55991b31fc1c45c09d
* | | | SystemUI: Lockscreen shortcut customizationDanesh M2015-11-057-0/+45
| | | | | | | | | | | | | | | | Change-Id: I4abf1deed0a342e111453516fa7820191a55ffc4
* | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0581-990/+695
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-222-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-185-4/+106
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5b25c04b472923b1334df87d5a271d3164694d20 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-082-39/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib02888af570eee35060b2c624eaaaee25df11ea6 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-051-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35c0512c48a8b1d8f4cb738a879d58421df8d747 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b1557f5ff69d19dadcf7be20a4a34eb55740466 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-224-7/+93
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-2077-924/+462
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1577-0/+924
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: Ie56e8483ffa87f863bb76f29f73fcdeeb7b4b2b2 Auto-generated-cl: translation import
| * | | am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-devJason Monk2015-07-141-0/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '2061049d69390a7f4ace9b37bb983ebbb4caa678': Move wifi accessibility strings to SettingsLib
generated by cgit v1.1 at 2025-02-09 11:54:40 +0000