OSDN Git Service
Chris Craik [Thu, 2 Jan 2014 21:04:27 +0000 (21:04 +0000)]
Merge "Use const access to snapshot from OpenGLRenderer"
Chris Craik [Wed, 1 Jan 2014 22:45:21 +0000 (14:45 -0800)]
Use const access to snapshot from OpenGLRenderer
Additionally, move clipping methods to StatefulBaseRenderer
Change-Id: Iff232bf16fc1ad3b7d89493da6d8915db7bc5e4f
Baligh Uddin [Thu, 2 Jan 2014 16:21:41 +0000 (08:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id551f263c58a8e036dd44b509242ed3b0ea38f3a
Auto-generated-cl: translation import
Chris Craik [Mon, 30 Dec 2013 23:32:54 +0000 (15:32 -0800)]
Move Snapshot management to intermediate StatefulBaseRenderer class
The eventual goal is for the StatefulBaseRenderer to serve as the
common base class between the DisplayListRenderer and OpenGLRenderer.
This will separate DisplayList recording, Snapshot stack management,
and the GL in OpenGLRenderer.
Additionally, avoid sp<> parameters, and use const parameters in
several places, with the intent of greatly reducing the surface area
where renderer subclasses can modify snapshot stack.
Next steps:
-move bulk of clipping logic into StatefulBaseRenderer
-disable direct snapshot access
Change-Id: Ibc3c6747134ec7daf8ea535866239fa73b874390
Chris Craik [Mon, 30 Dec 2013 21:55:47 +0000 (21:55 +0000)]
Merge "Create abstract base class for OpenGLRenderer"
Eino-Ville Talvala [Mon, 30 Dec 2013 20:55:23 +0000 (20:55 +0000)]
Merge "Camera2: Update android.blackLevel.lock"
Baligh Uddin [Mon, 30 Dec 2013 18:58:13 +0000 (18:58 +0000)]
am
136884b8: (-s ours) am
cc265eaf: (-s ours) am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
136884b8e6202e0c5aa49f48c4f1d41568d7f0b3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:55:43 +0000 (18:55 +0000)]
am
cc265eaf: (-s ours) am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
cc265eafed190a3586419cd43ddb4c62c9e874b5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:52:29 +0000 (18:52 +0000)]
am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
bb23697a7e2ad4568d402e7efe006fc4ac650749':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:49:56 +0000 (10:49 -0800)]
am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
d58d91ef8296a75e07fa7b9b78dd6d9f5dd72015':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:47:12 +0000 (10:47 -0800)]
am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 17:50:54 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If0e9986ff948df22a01cac35ad4fe8ebf40570ef
Auto-generated-cl: translation import
Baligh Uddin [Mon, 30 Dec 2013 17:30:42 +0000 (09:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
Chris Craik [Sat, 28 Dec 2013 00:51:19 +0000 (00:51 +0000)]
Merge "Avoid implicit parameter/return value casting of pointers."
Chris Craik [Fri, 27 Dec 2013 23:15:55 +0000 (15:15 -0800)]
Avoid implicit parameter/return value casting of pointers.
Change-Id: I88123a75c87bf9a88de9ef9fc3e9af70d6a18d7d
Chris Craik [Sat, 28 Dec 2013 00:43:22 +0000 (16:43 -0800)]
Avoid implicit parameter casting of pointers.
Change-Id: I568c4b38ce05f948e2456c54ae69921d328f3010
Chris Craik [Thu, 26 Dec 2013 23:13:13 +0000 (15:13 -0800)]
Create abstract base class for OpenGLRenderer
This will eventually serve as a base class to allow
DisplayListRenderer to split off from OpenGLRenderer, and could
eventually support other rendering approaches, such as an
SkCanvas/SkPicture.
This will also be the main source of (implementation-independent)
documentation of the canvas/renderer methods.
Change-Id: I52047f338f5cf86a3b0b3002af7154bff5c3c227
Baligh Uddin [Thu, 26 Dec 2013 23:54:55 +0000 (23:54 +0000)]
am
57d5cc88: (-s ours) am
5cf8dc8e: (-s ours) am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
57d5cc8849d47ed22db2c33590a7bf073a63cf07':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:54:49 +0000 (23:54 +0000)]
am
bf29cbbc: (-s ours) am
28e21fb4: (-s ours) am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bf29cbbc1df534dcf2f8553c70920b7cc056e76c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:54:44 +0000 (23:54 +0000)]
am
7aa47b52: (-s ours) am
c3e5b034: (-s ours) am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7aa47b52702d5be6b1644f4a6fe406e02c0cf5b8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:54:39 +0000 (23:54 +0000)]
am
1bc72efd: (-s ours) am
6afb554c: (-s ours) am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
1bc72efdef558f05164202df07a025983819d4ea':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:54:33 +0000 (23:54 +0000)]
am
ae9702bb: am
ac4ebda9: am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
ae9702bb41ba9f96ce26ff6e25ed9497632e087f':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:54:27 +0000 (23:54 +0000)]
am
9e39c952: am
9dd65b93: am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
9e39c9526d89f875a0884629d020e2253e9179dd':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:54:20 +0000 (23:54 +0000)]
am
aea9c66b: am
4e5a9b72: am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
aea9c66b4c39b1f5af132b7de800c383aa0df068':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:54:15 +0000 (23:54 +0000)]
am
6208ef25: am
c609cb0d: am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
6208ef25fd9b570770065edbfa71bbb2de8aa511':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:54:10 +0000 (23:54 +0000)]
am
7c0da7ec: am
bb6316db: am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
7c0da7ec5f26179d31b1f3b3211389765baeecc2':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:54:01 +0000 (23:54 +0000)]
am
75b3c99e: am
c2a3227a: am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
75b3c99ef542f91a690f62c46970bc9e3795ad30':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:50:28 +0000 (23:50 +0000)]
am
5cf8dc8e: (-s ours) am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5cf8dc8ea5b364802f9e986ddb7f4e21652145be':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:50:23 +0000 (23:50 +0000)]
am
28e21fb4: (-s ours) am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:50:18 +0000 (23:50 +0000)]
am
c3e5b034: (-s ours) am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c3e5b034ca88360f98c1b60e48ab9640dbd271b9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:50:13 +0000 (23:50 +0000)]
am
6afb554c: (-s ours) am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
6afb554cf07d2a4a2bffed34b696690d8ed0450a':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:50:08 +0000 (23:50 +0000)]
am
ac4ebda9: am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
ac4ebda9f64f7ff54270f9448f597bac4dea71fc':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:50:02 +0000 (23:50 +0000)]
am
9dd65b93: am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
9dd65b9397c97726bdd55ee7e91905f9ee34597c':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:49:57 +0000 (23:49 +0000)]
am
4e5a9b72: am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
4e5a9b72afbd902227d8dcef6426d3a3be41daef':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:49:51 +0000 (23:49 +0000)]
am
c609cb0d: am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
c609cb0d62b25b2526b8401e576df4dce5aa5a92':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:49:45 +0000 (23:49 +0000)]
am
bb6316db: am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
bb6316db12418c3f010f8c730f6d4644920bbe8a':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:49:39 +0000 (23:49 +0000)]
am
c2a3227a: am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
c2a3227a3d4bc055f311b50693b671c9667cfa67':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:44:18 +0000 (23:44 +0000)]
am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ca7a1442d0f633b663e59813957e98ef68c5f99e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:44:08 +0000 (23:44 +0000)]
am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c60be5b135dd13556e947784f20f792c1f9d568':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:44:03 +0000 (23:44 +0000)]
am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ad141bd7e267c74daf33416412f9aab30e9751fa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:43:59 +0000 (23:43 +0000)]
am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
b6d55917122b314c4ec547263e774934d67f2973':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:43:54 +0000 (23:43 +0000)]
am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
f16ddd6dd4fae500b7b512568db2c55b8919d920':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:43:49 +0000 (23:43 +0000)]
am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
cd73f7702fca082bf46d64b5c011f9dbe1b5fe65':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:43:45 +0000 (23:43 +0000)]
am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
317109dfaf0682f6ffbf11d71f3da84dfa295df6':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:43:40 +0000 (23:43 +0000)]
am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
b889885e9b5a605329ff8d7a35c373c88abf8c35':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:43:36 +0000 (23:43 +0000)]
am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5938b9a00e0133ca093755568c9a8a2e202f7daf':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:43:31 +0000 (23:43 +0000)]
am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
39b799820db4fa258dadb45b030830656168f95b':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:34:23 +0000 (15:34 -0800)]
am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a95f6e3ac450a8df9ae90585f2c0c02726f9cb01':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:18 +0000 (15:34 -0800)]
am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7aa56efd7399b0628bde655c535fac6407eaade9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:14 +0000 (15:34 -0800)]
am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
dd6517c9dff66a2165e147201e813e1f305425c2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:10 +0000 (15:34 -0800)]
am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
e965be75746d898611ee15d601dc97c8b206a542':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:34:03 +0000 (15:34 -0800)]
am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
2a1912971849b929dc2e4ec8d6368f477b1fddae':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:33:58 +0000 (15:33 -0800)]
am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:33:52 +0000 (15:33 -0800)]
am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:33:47 +0000 (15:33 -0800)]
am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:33:43 +0000 (15:33 -0800)]
am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5ad0e6289119dfaaa50a663e88dc0b978447302c':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:33:37 +0000 (15:33 -0800)]
am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
52604aadaafc0921c2f81df715f01bec546021a2':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Zhijun He [Thu, 26 Dec 2013 22:31:59 +0000 (22:31 +0000)]
Merge "Camera2: Update availableThumbnailSizes java doc"
Eino-Ville Talvala [Thu, 26 Dec 2013 21:19:10 +0000 (13:19 -0800)]
Camera2: Update android.blackLevel.lock
Change-Id: I4b3ebdf2043c4b242ac1c851a3be90f795f69a00
Baligh Uddin [Thu, 26 Dec 2013 21:00:44 +0000 (13:00 -0800)]
am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bbeb313567064b30ad93cdadd49beb8141c3d47b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 20:58:36 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 26 Dec 2013 20:58:31 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Zhijun He [Thu, 26 Dec 2013 19:49:09 +0000 (11:49 -0800)]
Camera2: Update availableThumbnailSizes java doc
Bug:
12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
Baligh Uddin [Thu, 26 Dec 2013 19:15:59 +0000 (11:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I27cfb0c604a4ab3deef7c4a55701e74cb1905172
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 19:11:15 +0000 (11:11 -0800)]
am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 19:09:48 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 19:09:24 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 26 Dec 2013 19:09:18 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 19:08:12 +0000 (11:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I90b992fe5850b901f15b4c9ae778a316d574edb2
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 19:07:34 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 18:43:19 +0000 (10:43 -0800)]
am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ea227306d68c7097b9cb079b1bfa6157c1ec2d30':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 18:42:01 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 26 Dec 2013 18:41:55 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 18:37:08 +0000 (10:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ca69fa39fbc71249e47fc90b569a7de69b8a7c3
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 18:16:09 +0000 (10:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 17:59:57 +0000 (09:59 -0800)]
am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
d6e863a19a631fd0003f96d507a21863fe973caa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 17:55:09 +0000 (09:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I20a01148e49e1ca8c3be44150987c0846f9671ee
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 17:53:23 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
Auto-generated-cl: translation import
Chris Craik [Sat, 21 Dec 2013 01:26:44 +0000 (01:26 +0000)]
Merge "Add initial APIs for 3d view manipulation."
Svetoslav [Sat, 21 Dec 2013 01:17:15 +0000 (01:17 +0000)]
Merge "Sometimes write may be called twice in a row for the same content."
Svetoslav [Sat, 21 Dec 2013 01:10:25 +0000 (17:10 -0800)]
Sometimes write may be called twice in a row for the same content.
In a rare case it is possible that on write of a print document
adapter is called twice for the same pages with nothing being
changed. This happens if while doing a write we get an update
request which correctly avoids calling layout on the adapter
but does call on write as we ignore that we are waining for the
requested pages to be written. Fun.
Change-Id: I33d7d26c7c4b083dc7b66bf762697b6dafd1ccc4
Amith Yamasani [Sat, 21 Dec 2013 00:36:48 +0000 (16:36 -0800)]
Merge commit '
817ec49e' into manualmerge
Conflicts:
services/print/java/com/android/server/print/PrintManagerService.java
Change-Id: I1b9bf364ca50ee3c48f53d87ae0ce23e7f3c2bc2
quddusc [Sat, 21 Dec 2013 00:15:55 +0000 (00:15 +0000)]
am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
cbc5f5410ff7c2b91e13f80a930f22944ce2ed88':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Sat, 21 Dec 2013 00:15:49 +0000 (00:15 +0000)]
am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Sat, 21 Dec 2013 00:13:56 +0000 (00:13 +0000)]
Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
quddusc [Fri, 20 Dec 2013 23:21:38 +0000 (15:21 -0800)]
docs: Fixed code snippet for unbinding from IAB v3 service.
Bug:
11858905
Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd
Chris Craik [Thu, 19 Dec 2013 21:31:15 +0000 (13:31 -0800)]
Add initial APIs for 3d view manipulation.
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
quddusc [Fri, 20 Dec 2013 23:12:58 +0000 (15:12 -0800)]
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive.
Bug:
11926096
Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Fri, 20 Dec 2013 23:10:33 +0000 (23:10 +0000)]
am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
70b96ec7303c1b34ff9d63a03359efadeec075c2':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Fri, 20 Dec 2013 23:10:28 +0000 (23:10 +0000)]
am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Fri, 20 Dec 2013 23:08:07 +0000 (23:08 +0000)]
Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
quddusc [Fri, 20 Dec 2013 23:07:34 +0000 (23:07 +0000)]
Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
quddusc [Fri, 20 Dec 2013 22:44:51 +0000 (14:44 -0800)]
docs: Added missing elements under "can contain:" list in manifest-element.html.
Bug:
5793521
Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8
quddusc [Fri, 20 Dec 2013 23:01:28 +0000 (23:01 +0000)]
am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
12182bc236dd8e120a1f25d1a1862db744425558':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Fri, 20 Dec 2013 22:59:05 +0000 (22:59 +0000)]
Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
quddusc [Fri, 20 Dec 2013 22:55:09 +0000 (14:55 -0800)]
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
Bug:
6804017
Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
Amith Yamasani [Fri, 20 Dec 2013 21:27:30 +0000 (13:27 -0800)]
Wrap some services into a SystemService
These services can now be excluded by modifying the list of REQUIRED_SERVICES (TB renamed)
Changed appwidget, devicepolicy, backup and print services.
Change-Id: Id8e2855d5c045cd57bdb02dca9ed75172803bce7
quddusc [Fri, 20 Dec 2013 22:07:45 +0000 (14:07 -0800)]
docs: Fixed deprecated constructor.
Bug:
10581815
Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6
Chris Craik [Fri, 20 Dec 2013 22:06:01 +0000 (22:06 +0000)]
Merge "Move GLES20DisplayList functionality into DisplayList"
Chris Craik [Fri, 20 Dec 2013 21:28:11 +0000 (13:28 -0800)]
Move GLES20DisplayList functionality into DisplayList
Removes unneeded indirection layer
Change-Id: I75d3e369eda2788cbc52a3575c4e1c521e842f59
OSDN Git Service
