summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler/res
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2017-04-281-71/+4
| | | | Change-Id: Ifeae1515729fc73ba3198e72b3479870092af3c1
* Automatic translation importAbhisek Devkota2017-02-191-0/+93
| | | | Change-Id: I80e32cc003cc9c8707732b27a683e87cdd67375d
* Use material icons in printer selection activity.Danny Baumann2016-10-302-2/+28
| | | | Change-Id: I4150e18d1a2e1c5ed8bad576ed3b21f2b5d7e60d
* Automatic translation importpinky@build012016-09-271-0/+17
| | | | | Change-Id: I77a3c0eb997d6f2aaf9b1add59480c496e55e43d Ticket: -
* Automatic translation importpinky@build012016-08-273-0/+279
| | | | | Change-Id: If7eac9a9fa7e145c9d35ece91a8ccab33601a1ca Ticket: -
* Revert "Adding back pdf_printer_media_sizes for values-zh-rCN to accomodate ↵Keith Mok2016-08-051-37/+0
| | | | | | | | | | mediasize_default" CYNGNOS-3238, HAM-1384 This reverts commit 10a63e4e3bb26ff0bc82de303e74628ae23eab3e. Change-Id: Ic13bdd51e059b4e66674fdbe6e6da3c2779f6a38
* Automatic translation importAbhisek Devkota2016-05-141-0/+9
| | | | Change-Id: I3d1a3f5e5b488776048d0dbaac757ffb1e2f8e7b
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0478-99/+289
| | | | | | | | | 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/+93
| | | | Change-Id: Ib87e41106982b159d249ebbe0653e569f9c7b454
* Automatic translation importMichael Bestas2016-04-061-0/+93
| | | | Change-Id: I3849e73aee18720b20529d406c7657c0a0cee320
* Automatic translation importMichael Bestas2016-03-282-0/+186
| | | | Change-Id: Ib371d8f862dced4aa36cfe076f876e9ae4bd62c2
* Automatic translation importMichael Bestas2016-03-1813-0/+1177
| | | | Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1178-289/+99
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-devAlan Viverette2015-06-181-0/+3
| |\ | | | | | | | | | | | | * commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3': DO NOT MERGE: Remove DayNight theme
| * \ am e4bd7c98: Improve string comment.Makoto Onuki2015-06-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'e4bd7c98323b39a47682216bebf442de206a95dd': Improve string comment.
| * \ \ am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-devMakoto Onuki2015-06-051-22/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'fba7f5d73cce893860faa3af9df7b4099a8565a1': Fix crash on simplified Chinese.
| * \ \ \ am c0f9ca7b: Merge "Change option label from "Duplex" to "Two-sided"" into ↵Makoto Onuki2015-06-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'c0f9ca7bf1212448ee40f3fee0095b634d96c5ab': Change option label from "Duplex" to "Two-sided"
| * \ \ \ \ am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into ↵Alan Viverette2015-05-271-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '8141d6e1509a586e2954fbece04e64aaa02092a2': Use DeviceDefault (dark) theme for PrintActivity
* | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96f3c5a41d3c52473c161aaf2c97d821caa99bb9
* | | | | | | Revert "Themes: Expose "ALL" layouts hard code in frameworks base for themes"Steve Kondik2015-12-053-25/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Many apps which display listviews crash with this change. Reverting for now. This reverts commit e6458a3380b36ab0e3538159e854b7f815a838f3. Change-Id: Icc4d0ee18c708a5692db0b20f7b6b2084d8dd43b
* | | | | | | Themes: Expose "ALL" layouts hard code in frameworks base for themesBryan Owens2015-12-043-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposing all the hard coded layout colors in the enitre base so themes can have access. Change-Id: I4bc88573d0d7e41fc80d1580ab4e012f48c442d3 Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
* | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-054-3/+98
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3 Auto-generated-cl: translation import
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-183-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a186ed5db66f57c223a432802d130165bfcb5d4 Auto-generated-cl: translation import
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-117-10/+10
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7201c2b8f3e2e5319ed1ca4fd25f6d8987547913 Auto-generated-cl: translation import
* | | | | | | Adding back pdf_printer_media_sizes for values-zh-rCN to accomodate ↵Raj Yengisetty2015-10-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediasize_default Change-Id: I45cfd8babe813fa5dba49bb444e10517a3771f30
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e22afc43c9029b40ba2df53dfc10a9a688c4fd2 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-066-9/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia90a9400d718b5ef61f55ed4d6c5eb9fe48d9667 Auto-generated-cl: translation import
* | | | | | DO NOT MERGE: Remove DayNight themeAlan Viverette2015-06-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not go gentle into that good night, Old age should burn and rave at close of day; Rage, rage against the dying of the light. Though wise men at their end know dark is right, Because their words had forked no lightning they Do not go gentle into that good night. Bug: 21854466 Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-105-8/+5
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Change-Id: I20b6c72047df24a7b6f9ad21db1234bdc4889925 Auto-generated-cl: translation import
* | | | | Improve string comment.Makoto Onuki2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21685729 Change-Id: If6c79730778f399ed0dbf500ef62df3150fbaea6
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-84/+87
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Ib2b21a5127e5d2c29bf60c62fa90c5e1dca3ccf1 Auto-generated-cl: translation import
* | | | Merge "Fix crash on simplified Chinese." into mnc-devMakoto Onuki2015-06-051-22/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix crash on simplified Chinese.Makoto Onuki2015-06-051-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They use the standard A/B sizes in China too. Bug 20340812 Change-Id: Ia0842f8ddbdcb4cb2738b746509c60de25b64966
* | | | Change option label from "Duplex" to "Two-sided"Makoto Onuki2015-06-041-1/+1
|/ / / | | | | | | | | | | | | | | | Bug 21640154 Change-Id: Icab4754e0aeb23fc4da178e7306f5c7a74108c22
* | | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+95
| |/ |/| | | | | | | Change-Id: Ic3da6671bd7a81f8a9c07a0a922d07b773377f96 Auto-generated-cl: translation import
* | Use DeviceDefault (dark) theme for PrintActivityAlan Viverette2015-05-271-1/+1
| | | | | | | | | | Bug: 21433656 Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-141-2/+2
|/ | | | | Change-Id: I0096104dd65eeb3b4e7bf836c09a58f8aa34965e Auto-generated-cl: translation import
* DayNight theme for framework packagesAlan Viverette2015-05-051-4/+1
| | | | Change-Id: I745f90561c957c83540e75a2886e294633c83be1
* Import translations. DO NOT MERGEGeoff Mendal2015-04-271-2/+2
| | | | | Change-Id: I66a29628216bcfbb56a5820ba0598bd95af27a81 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+285
| | | | | Change-Id: I67f51468d775874da33c28786b86c69e7f1459b1 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-251-1/+1
| | | | | Change-Id: I9d36d679d32ee84e90eec1d51515894c36390bc1 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+95
| | | | | Change-Id: I43f19279f08e1c5b204836ee69e715c1f889acc7 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-02-1672-576/+624
| | | | | Change-Id: I923776f2ceb27b39485ffc29fb8422bf85e48261 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-02-111-1/+1
| | | | | Change-Id: I6498f5f266d79b90c3b41956290838e199e50999 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-02-0972-189/+147
| | | | | Change-Id: I0636cbe07799e0bd53c2157bf4074d9e7a5f5b1c Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-02-0472-1/+475
| | | | | Change-Id: I1045d9d3bcb2ddce2eb2c57fff87827c5ee23f04 Auto-generated-cl: translation import
* Add duplex mode support.Svetoslav2015-02-042-1/+42
| | | | | | | | | This change adds support for duplex printing. The print UI now has a duplex option which allows the user to choose one of the supported duplex options by the currently selected printer. The chosen duplex mode is propaged to the print service that manages this printer. Change-Id: I807ba9da2723531535c0e1e33f2f4e1b503a54b0
* am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler ↵Svetoslav2015-01-271-0/+33
|\ | | | | | | | | | | | | | | | | resources" into lmp-mr1-dev automerge: 3fd1ebf * commit '3fd1ebff6c017ba4495070cb34f1ed7652b33cc9': Add a missing file to print spooler resources
| * am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler ↵Svetoslav2015-01-271-0/+33
| |\ | | | | | | | | | | | | | | | | | | resources" into lmp-mr1-dev * commit 'fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8': Add a missing file to print spooler resources