summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-101-22/+0
|\ | | | | | | | | | | https://android.googlesource.com/platform/frameworks/opt/colorpicker into cm-13.0 Android 6.0.1 release 22
| * am 09265698: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| |\ | |/ |/| | | | | * commit '092656988fa7ead4196a9e0f118db8a898e49091': Import translations. DO NOT MERGE
* | Import translations. DO NOT MERGEstable/cm-13.0-ZNH0EGeoff Mendal2015-05-301-0/+22
|/ | | | | Change-Id: I6987fb550aded8cf4908a12943241e633a487671 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+66
| | | | | Change-Id: I3918cfe1d94627414d7b18256905828a071a9b89 Auto-generated-cl: translation import
* am afb167eb: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-230-0/+0
|\ | | | | | | | | | | MERGE ANYWHERE. * commit 'afb167eb8e457ac8b3f815b5e26de0530508d962':
| * reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\
| | * am 59aefd0a: (-s ours) am bb176610: (-s ours) am 0158c378: (-s ours) Import ↵Baligh Uddin2015-03-200-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '59aefd0a4d913aab1d09a6ba60d6bf8757e6d406':
| | * \ am 2e800c01: (-s ours) am 70f7b1b6: (-s ours) am cb9247ce: (-s ours) Merge ↵Baligh Uddin2015-03-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit '2e800c017bc4400a360d002db5767a2142710186':
| | * \ \ am f3a2bb19: (-s ours) am f8e8d1cd: (-s ours) am ce6b0b64: (-s ours) am ↵Baligh Uddin2015-03-200-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b832145a: (-s ours) am 1869e1d2: (-s ours) Import translations. DO NOT MERGE * commit 'f3a2bb195ec08960c54d8ad0e875a6c072c8abf5':
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-201-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I431c9e43ba520c72aaf5591e8f53acc8a15bc808 Auto-generated-cl: translation import
* | | | | | am 29687faf: am 3aba71d7: am 7e99b1bb: am 339b5802: am 1f527487: am ↵Scott Kennedy2015-03-053-88/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 098a45a0: am 03b9eae6: am 25ec099d: Remove unnecessary themes * commit '29687faf584d6834b9facc8541d287460a0755d9': Remove unnecessary themes
| * | | | | am 3aba71d7: am 7e99b1bb: am 339b5802: am 1f527487: am 098a45a0: am ↵Scott Kennedy2015-03-053-88/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 03b9eae6: am 25ec099d: Remove unnecessary themes * commit '3aba71d75256cee34b4228a4f833377cd7f74fbd': Remove unnecessary themes
| | * | | | | am 7e99b1bb: am 339b5802: am 1f527487: am 098a45a0: am 03b9eae6: am ↵Scott Kennedy2015-03-053-88/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25ec099d: Remove unnecessary themes * commit '7e99b1bb76a7c222affaade25d0607290b7e0f9f': Remove unnecessary themes
| | | * | | | am 339b5802: am 1f527487: am 098a45a0: am 03b9eae6: am 25ec099d: Remove ↵Scott Kennedy2015-03-053-88/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary themes * commit '339b5802ae983509c9cdb91b8f30ccd81caf5b06': Remove unnecessary themes
| | | | * \ \ \ am 1f527487: am 098a45a0: am 03b9eae6: am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-053-88/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f527487db07c7303c2b96c22b6484899db53f89': Remove unnecessary themes
| | | | | * \ \ \ am 098a45a0: am 03b9eae6: am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '098a45a07413d86589e21de7010567926fe8a410': Remove unnecessary themes
| | | | | | * \ \ \ am 03b9eae6: am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '03b9eae62dc82e7bc9c96a313fa4f1d3cb58e3c5': Remove unnecessary themes
| | | | | | | * \ \ \ am 25ec099d: Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25ec099d386ded408be9ee5ab736ce20b62c66ee': Remove unnecessary themes
| | | | | | | | * | | | Remove unnecessary themesScott Kennedy2015-03-043-88/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are named the same in a bunch of projects, are never used here, and are causing conflicts. Change-Id: I26d4e23f9c7f0cc5c1307e06e62c3e1e7504d9ed
* | | | | | | | | | | | am 7b0e4d19: (-s ours) am 7d0fa429: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b0e4d1995090e922e91a4813f78823a77a89bdf': Import translations. DO NOT MERGE
| * | | | | | | | | | | am 7d0fa429: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d0fa4294d0971ec23a0d6a3e7db4e00a2757020': Import translations. DO NOT MERGE
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-261-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96a677dd2816c088e2e02c1de6c969b6eb33d49f Auto-generated-cl: translation import
* | | | | | | | | | | | am 9505ea1b: (-s ours) am bfd56c66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9505ea1b44f1ff92e4ea22aefdd74541d9b3cb7d': Import translations. DO NOT MERGE
| * | | | | | | | | | | am bfd56c66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfd56c66c2c1488eea639281bfc4764c8c7fd2fc': Import translations. DO NOT MERGE
| | * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-121-1/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I667ad1a0965ffd381939fd65847179ef0f7f1ad4 Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I180ac7e0e068f76c682fceecb064e87ed9d54683 Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieeb2d4e1ea2c5e6682bc45a2bd2fb3922134758f Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I463bc549a1e8bd1411731c3e958dd599f0a463b5 Auto-generated-cl: translation import
* | | | | | | | | | | am f2c5894c: am 6563b3d6: Bug: 18538668 Fixing index in color picker content ↵Kaikai Wang2014-12-091-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description to be zero-based * commit 'f2c5894c9accb5d860195ff483c739662ae63f2a': Bug: 18538668 Fixing index in color picker content description to be zero-based
| * | | | | | | | | | am 6563b3d6: Bug: 18538668 Fixing index in color picker content description ↵Kaikai Wang2014-12-081-3/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be zero-based * commit '6563b3d6f6bdee33c258a0f3139ebb97f2d23f1e': Bug: 18538668 Fixing index in color picker content description to be zero-based
| | * | | | | | | | | Bug: 18538668 Fixing index in color picker content description to be zero-basedKaikai Wang2014-12-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I026d7706b17aef774650cd0879cc9594ed856b29
* | | | | | | | | | | am 63fb4a20: am 1f20a749: Adding custom color swatch content description ↵Kaikai Wang2014-12-092-16/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support to color picker for accessibility * commit '63fb4a209ef45bc777a22b99da42e8168ba13d6e': Adding custom color swatch content description support to color picker for accessibility
| * | | | | | | | | | am 1f20a749: Adding custom color swatch content description support to color ↵Kaikai Wang2014-12-082-16/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | picker for accessibility * commit '1f20a74925ab5ca73b451a437a718eb72f9a22b3': Adding custom color swatch content description support to color picker for accessibility
| | * | | | | | | | | Adding custom color swatch content description support to color picker for ↵Kaikai Wang2014-12-052-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessibility Bug: 18538668 color in color picker does not have name in talk back mode Change-Id: Ib09b7cc21eabca4bfb64d8b7dcd856bf63992aef
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3db821301d8c8a4453b8e1b77d36fc82d8753fec Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54416cae3a7ef6c1faf5a40a77b316d78417744f Auto-generated-cl: translation import
* | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I082d6546066bac7281c27c68d61347eb09bc5b76 Auto-generated-cl: translation import
* | | | | | | | | | | am 514c24c6: (-s ours) am f22a676a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '514c24c669f5eb34d6d5ab8bca49b83e352cad05': Import translations. DO NOT MERGE
| * | | | | | | | | | am f22a676a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f22a676aa67d7913d3436e395fdb7e24e17bb3f8': Import translations. DO NOT MERGE
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4b8ac13361f42ff129cd210af8c483e85607e08 Auto-generated-cl: translation import
* | | | | | | | | | | | am 11b5f9cf: (-s ours) am 84d183d7: (-s ours) am b52e0c49: (-s ours) am ↵Baligh Uddin2014-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cfd2cdd: (-s ours) Import translations. DO NOT MERGE * commit '11b5f9cfbbb88628fbe02e9099890fb7ee081fbc':
| * | | | | | | | | | | am 84d183d7: (-s ours) am b52e0c49: (-s ours) am 2cfd2cdd: (-s ours) Import ↵Baligh Uddin2014-10-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '84d183d7f072acbba302eec77616e334098784f6':
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If24ffdf4af6dabd2fe764d1ad1a34ab5b53d2995 Auto-generated-cl: translation import
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7d562f7607196925f214d2e617269a2232260d11 Auto-generated-cl: translation import
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I582c6ee9471574c2a5db2c3e467e5855de4cc83d Auto-generated-cl: translation import
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f00874ba8aa90bcc5972715cff9a53586bb1dbb Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iffe868f9efc3c091f191b1b65c62ae3481bb9ab2 Auto-generated-cl: translation import
* | | | | | | | | | | | | am 4450b165: (-s ours) am 5592cb92: (-s ours) am 7e4b088e: (-s ours) am ↵Baligh Uddin2014-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d622da63: (-s ours) am 2cfd2cdd: (-s ours) Import translations. DO NOT MERGE * commit '4450b165bd53f319327ffb6e457387c5562c580d':
| * | | | | | | | | | | | am 5592cb92: (-s ours) am 7e4b088e: (-s ours) am d622da63: (-s ours) am ↵Baligh Uddin2014-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cfd2cdd: (-s ours) Import translations. DO NOT MERGE * commit '5592cb927e2dd42297121124b21c983a0131bf4a': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 12:31:32 +0000