drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,569 Commits 1 Branch 0 Tags
Commit Graph

121569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Katie McCormick
83fbad4c3f am 02d5df10: am d59c6151: am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit '02d5df1066c07972e1169a338e5fba16c86cc51b':
  Doc update: update console instructions per new UI.
 2014-01-03 21:23:45 +00:00
Katie McCormick
02d5df1066 am d59c6151: am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit 'd59c615177ad827fd65dcdf4f595f40f84ca6cc5':
  Doc update: update console instructions per new UI.
 2014-01-03 21:21:53 +00:00
Katie McCormick
d59c615177 am 406fb742: am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit '406fb742f461e3deda83984a47e66fc6bccacc78':
  Doc update: update console instructions per new UI.
 2014-01-03 21:18:21 +00:00
Katie McCormick
406fb742f4 am 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit '65f5d74eada8937d68c821ff4f1c609e16613d22':
  Doc update: update console instructions per new UI.
 2014-01-03 13:15:23 -08:00
Katie McCormick
65f5d74ead am 048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs 
* commit '048895b5a0532fef394a4a3f07af737f8d733335':
  Doc update: update console instructions per new UI.
 2014-01-03 21:12:42 +00:00
Katie McCormick
048895b5a0 Merge "Doc update: update console instructions per new UI." into klp-docs 2014-01-03 21:09:38 +00:00
Zhijun He
9e4b8e41fb Merge "Camera2: fix onClosed callback issue" 2014-01-03 00:46:55 +00:00
Zhijun He
b437428b3f Merge "Camera2: remove waitUntilIdle from Camera2 API" 2014-01-03 00:46:28 +00:00
Brett Chabot
360604b498 Merge "Don't attempt to launch disabled activities in smoke test." 2014-01-02 23:29:54 +00:00
Zhijun He
2db56026bf Camera2: fix onClosed callback issue 
The camera isClosed status shouldn't be checked to fire onClosed callback,
otherwise, onClosed callback is almost never fired when camera close is called
because the camera device is already closed.

Change-Id: I987242d53a12082828a992404ed55ee8a378f93f
 2014-01-02 15:12:00 -08:00
Chris Craik
406af0293f Fix isRecording override 
Change-Id: Ie73db838b749c29c6a8480ab67897492b83d337a
 2014-01-02 14:56:40 -08:00
Brett Chabot
c0104148fa Don't attempt to launch disabled activities in smoke test. 
Also remove the superfluous runner from manifest.

Bug: 12245071
Change-Id: I724b87dd49b04eb3291be88f6d7ab035d67c3971
 2014-01-02 14:41:21 -08:00
Chris Craik
e459367a3a Merge "Use const access to snapshot from OpenGLRenderer" 2014-01-02 21:04:27 +00:00
Chris Craik
d6b65f6771 Use const access to snapshot from OpenGLRenderer 
Additionally, move clipping methods to StatefulBaseRenderer

Change-Id: Iff232bf16fc1ad3b7d89493da6d8915db7bc5e4f
 2014-01-02 12:57:41 -08:00
Baligh Uddin
23ab74de5e Import translations. DO NOT MERGE 
Change-Id: Id551f263c58a8e036dd44b509242ed3b0ea38f3a
Auto-generated-cl: translation import
 2014-01-02 08:21:41 -08:00
Chris Craik
14e513058e 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
 2014-01-01 13:59:13 -08:00
Chris Craik
539394ec3a Merge "Create abstract base class for OpenGLRenderer" 2013-12-30 21:55:47 +00:00
Eino-Ville Talvala
aa161c600d Merge "Camera2: Update android.blackLevel.lock" 2013-12-30 20:55:24 +00:00
Baligh Uddin
b30b09d771 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
 2013-12-30 18:58:13 +00:00
Baligh Uddin
136884b8e6 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
 2013-12-30 18:55:43 +00:00
Baligh Uddin
cc265eafed am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb23697a7e2ad4568d402e7efe006fc4ac650749':
  Import translations. DO NOT MERGE
 2013-12-30 18:52:29 +00:00
Baligh Uddin
bb23697a7e am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE 
* commit 'd58d91ef8296a75e07fa7b9b78dd6d9f5dd72015':
  Import translations. DO NOT MERGE
 2013-12-30 10:49:56 -08:00
Baligh Uddin
d58d91ef82 am 2ae0419f: (-s ours) Import translations. DO NOT MERGE 
* commit '2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
  Import translations. DO NOT MERGE
 2013-12-30 10:47:12 -08:00
Baligh Uddin
2aec0d413e Import translations. DO NOT MERGE 
Change-Id: If0e9986ff948df22a01cac35ad4fe8ebf40570ef
Auto-generated-cl: translation import
 2013-12-30 09:50:54 -08:00
Baligh Uddin
2ae0419fb1 Import translations. DO NOT MERGE 
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
 2013-12-30 09:30:42 -08:00
Chris Craik
91fcb7d7e3 Merge "Avoid implicit parameter/return value casting of pointers." 2013-12-28 00:51:19 +00:00
Chris Craik
9f66ea06ac Avoid implicit parameter/return value casting of pointers. 
Change-Id: I88123a75c87bf9a88de9ef9fc3e9af70d6a18d7d
 2013-12-27 16:45:05 -08:00
Chris Craik
7a02ea3eaa Avoid implicit parameter casting of pointers. 
Change-Id: I568c4b38ce05f948e2456c54ae69921d328f3010
 2013-12-27 16:43:22 -08:00
Chris Craik
b458942bb6 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
 2013-12-27 14:40:06 -08:00
Baligh Uddin
6debfb90ee 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
 2013-12-26 23:54:55 +00:00
Baligh Uddin
00703316a8 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
 2013-12-26 23:54:49 +00:00
Baligh Uddin
f87f7b0196 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
 2013-12-26 23:54:44 +00:00
Baligh Uddin
f38d305bfa 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
 2013-12-26 23:54:39 +00:00
quddusc
22c082b00b 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
 2013-12-26 23:54:33 +00:00
quddusc
5b100c15d2 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
 2013-12-26 23:54:27 +00:00
quddusc
9bd62d7a61 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
 2013-12-26 23:54:20 +00:00
quddusc
7999170276 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
 2013-12-26 23:54:15 +00:00
quddusc
cafb29a315 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
 2013-12-26 23:54:10 +00:00
quddusc
0c0474fd87 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."
 2013-12-26 23:54:01 +00:00
Baligh Uddin
57d5cc8849 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
 2013-12-26 23:50:28 +00:00
Baligh Uddin
bf29cbbc1d 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
 2013-12-26 23:50:23 +00:00
Baligh Uddin
7aa47b5270 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
 2013-12-26 23:50:18 +00:00
Baligh Uddin
1bc72efdef 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
 2013-12-26 23:50:13 +00:00
quddusc
ae9702bb41 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
 2013-12-26 23:50:08 +00:00
quddusc
9e39c9526d 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
 2013-12-26 23:50:02 +00:00
quddusc
aea9c66b4c 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
 2013-12-26 23:49:57 +00:00
quddusc
6208ef25fd 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
 2013-12-26 23:49:51 +00:00
quddusc
7c0da7ec5f 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
 2013-12-26 23:49:45 +00:00
quddusc
75b3c99ef5 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."
 2013-12-26 23:49:39 +00:00
Baligh Uddin
5cf8dc8ea5 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
 2013-12-26 23:44:18 +00:00