summaryrefslogtreecommitdiffstats
path: root/packages/Shell/res
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2017-04-281-4/+2
| | | | Change-Id: Ifeae1515729fc73ba3198e72b3479870092af3c1
* Automatic translation importAbhisek Devkota2017-02-191-0/+24
| | | | Change-Id: I80e32cc003cc9c8707732b27a683e87cdd67375d
* Automatic translation importpinky@build012016-08-273-0/+72
| | | | | Change-Id: If7eac9a9fa7e145c9d35ece91a8ccab33601a1ca Ticket: -
* Automatic translation importblinky@build012016-08-131-0/+2
| | | | | Change-Id: I599894bfd30ff9d78253482981737fc8a440a826 Ticket: -
* Automatic translation importAbhisek Devkota2016-05-171-0/+1
| | | | Change-Id: I3e905d33baa25bbbccffeb48dab1a53a22f6bc3a
* Automatic translation importAbhisek Devkota2016-05-141-0/+1
| | | | Change-Id: I3d1a3f5e5b488776048d0dbaac757ffb1e2f8e7b
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0410-11/+39
| | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
* Automatic translation importMichael Bestas2016-04-161-0/+24
| | | | Change-Id: Ib87e41106982b159d249ebbe0653e569f9c7b454
* Automatic translation importMichael Bestas2016-04-061-0/+24
| | | | Change-Id: I3849e73aee18720b20529d406c7657c0a0cee320
* Automatic translation importMichael Bestas2016-03-282-0/+48
| | | | Change-Id: Ib371d8f862dced4aa36cfe076f876e9ae4bd62c2
* Automatic translation importMichael Bestas2016-03-1813-0/+222
| | | | Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1110-39/+11
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
* | Automatic translation importMichael Bestas2016-02-141-0/+5
| | | | | | | | Change-Id: I6f7e9a4d7d72272d445319a26b386d7098aa26a4
* | Automatic translation importMichael Bestas2015-12-255-0/+113
| | | | | | | | Change-Id: I96f3c5a41d3c52473c161aaf2c97d821caa99bb9
* | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-052-2/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-183-4/+30
| | | | | | | | | | | | | | | Change-Id: Ie83919c03d360d8955701954b4888e0e7ac51aae Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-115-5/+5
| | | | | | | | | | | | | | | Change-Id: I787a0e53f646c1b015882b689785f24b641e4eba Auto-generated-cl: translation import
* | | frameworks: add ongoing notification while collecting bug reportRoman Birg2015-10-261-0/+20
| | | | | | | | | | | | | | | Change-Id: I644da7046b3cbbd0ec601f0e35dfbad6adf4dcf5 Signed-off-by: Roman Birg <roman@cyngn.com>
* | | Import translations. DO NOT MERGEGeoff Mendal2015-07-156-7/+7
|/ / | | | | | | | | Change-Id: I428e579d5968139dcdf6e8e693f4d2eef182c682 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-1/+3
| | | | | | | | | | Change-Id: Ib590e26c7e75ed6bbc29654fbe16a18e75089dbc Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-131-1/+1
|/ | | | | Change-Id: If33561fdaf98e273425caa3c0e9da3cf81446886 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+78
| | | | | Change-Id: Icab122bac2891ca4580116d2c357b7ac64d6baad Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-301-2/+1
| | | | | Change-Id: I33c678add2505ec35670928d3e0c0c9751c66bda Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-2772-144/+72
| | | | | Change-Id: Ie3cde38ec6847cf49d6ce2ed9b21b23f27ef5d63 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-2573-0/+146
| | | | | Change-Id: I9f8461cc3c0002086052c65ba0c1ac801198c042 Auto-generated-cl: translation import
* Add BugreportStorageProviderRyo Hashimoto2015-03-231-0/+3
| | | | | | | BugreportStorageProvider provides storage backend for bugreports. BUG:18070208 Change-Id: I8506dd90d69907090295d99df7427fc747b83698
* Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+25
| | | | | Change-Id: I05e39854eb2d78c22192faebdbfab579831b162a Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-161-1/+1
| | | | | Change-Id: Id941e0ba453bd6b39cf654f0a20a68219584bd2a Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-02-251-3/+3
| | | | | Change-Id: Iaf416dc2326ddaf2601b5c37d0e86b2b6fb8e307 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-02-021-1/+1
| | | | | Change-Id: I9c23372467960ad066b9089b4a76e3a257d147eb Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2014-11-241-1/+1
| | | | | Change-Id: I1b7255d3a1bda752665435e6a1113c735dc0702d Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2014-11-191-1/+1
| | | | | Change-Id: Ifac2744b085fd628d2688543243f52e2bec82292 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2014-10-132-3/+3
| | | | | Change-Id: I8e3dbfe296ef739e2634d602ca467a0f7ca19e33 Auto-generated-cl: translation import
* am 02737364: am 94f06154: am 6bf67ef1: am c7d477bb: Merge "Keep the ↵Wei Liu2014-10-071-6/+11
|\ | | | | | | | | | | | | BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev * commit '027373644acda54a1463d96290fa85fe02b33637': Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
| * am 94f06154: am 6bf67ef1: am c7d477bb: Merge "Keep the ↵Wei Liu2014-10-071-6/+11
| |\ | | | | | | | | | | | | | | | | | | BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev * commit '94f06154012b57650aa79af9210fc73311333601': Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
| | * Keep the BugreportWarningActivity screen on.Wei Liu2014-10-071-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Make the bugreport warning text scrollable. Bug: 16930717 Change-Id: I270ee3f3acdcdab2febc2a2768382bbfb20c438b
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-241-1/+1
| | | | | | | | | | | | | | | Change-Id: If7ded66957dff5714f58db7fbf5fc6bdcaa37040 Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEBaligh Uddin2014-07-281-1/+1
| |/ | | | | | | | | Change-Id: I0495a69db49b3475537a3546bcb4d246b4dd018b Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2014-07-221-2/+1
| | | | | | | | | | Change-Id: I2808fa9de557f81f25e19b14b8db854516c759a4 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2014-07-2028-56/+28
| | | | | | | | | | Change-Id: I73983e44eec615f929d27351032fd1d532ee68a1 Auto-generated-cl: translation import
| * Merge "Remove deprecated locales - DO NOT MERGE" into lmp-devBaligh Uddin2014-07-1711-264/+0
| |\
| | * Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-264/+0
| | | | | | | | | | | | Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
| * | Import translations. DO NOT MERGEBaligh Uddin2014-07-1938-59/+64
| |/ | | | | | | | | Change-Id: I179193c20f5362e2c1afb3ea15c623e63e15a688 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2014-07-1655-55/+151
| | | | | | | | | | Change-Id: I3abf5d2591425f79a3b1afa86f161d4a5e197796 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-201-1/+1
| | | | | | | | | | Change-Id: I494beec337bdfcce1577980b5fa5467e318bb2e6 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-162-5/+5
| | | | | | | | | | Change-Id: I82a202c3d181d168af7db2574e2815ca2cfc05da Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-081-1/+1
| | | | | | | | | | Change-Id: I027cbe4d35843fc56ad3074960b98173cfa493f6 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-08-261-1/+1
| | | | | | | | | | Change-Id: I5ebce437cb8cfc11bc608632a84c7ea3c12b72f7 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2014-07-301-1/+1
| | | | | | | | | | Change-Id: Iea42fe438028d1e3e613d793a84d1de943a3103e Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-07-2272-72/+144
| | | | | | | | | | Change-Id: I82369d982311219c969ed25bc7700cb69d788dbf Auto-generated-cl: translation import