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

121598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
a144b121b2 Merge "Fix RemoteController synchronization mode" 2014-01-06 22:46:43 +00:00
Baligh Uddin
c2ee7bb146 Merge "Import translations. DO NOT MERGE" 2014-01-06 21:45:23 +00:00
Baligh Uddin
5bdb5cd335 Merge "Import translations. DO NOT MERGE" 2014-01-06 21:45:09 +00:00
Baligh Uddin
d5b2a3aae8 Import translations. DO NOT MERGE 
Change-Id: I88c828f80f2fc1ff71f868c0e6630d68ddac9ba4
Auto-generated-cl: translation import
 2014-01-06 13:17:32 -08:00
Baligh Uddin
9d31f7e6ef Import translations. DO NOT MERGE 
Change-Id: I4a38f3f7e116afdebf615f41e4f8305825c56507
Auto-generated-cl: translation import
 2014-01-06 12:39:16 -08:00
Alan Viverette
0ffd9ca579 Merge "Use layers for reveal drawable" 2014-01-06 20:37:31 +00:00
John Spurlock
f121921d9a Merge "Add rotation-lock to Quick Settings on phones." 2014-01-06 19:21:58 +00:00
Chong Zhang
f12aa45bcb Merge "MediaRecorder: add getSurface() api and SURFACE video source" 2014-01-06 19:05:09 +00:00
Chong Zhang
83cc994ba4 MediaRecorder: add getSurface() api and SURFACE video source 
Bug: 12305192
Change-Id: If833c5ac8a738ffa284307e0435b5cbd1b7379b1
 2014-01-06 10:42:51 -08:00
Raph Levien
dcd8258e24 am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '971003c9ffc854f4b080af902457e7a6447f692a':
  Re-initialize error after attach
 2014-01-06 17:16:02 +00:00
Todd Poynor
0e3f0caee6 am a807dbae: am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit 'a807dbaeed2a125cea6868f6d51402f8416fddec':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:15:53 +00:00
Raph Levien
971003c9ff am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'ece5bc9d692ec1579f45d9e28fdf52c1d966a21b':
  Re-initialize error after attach
 2014-01-06 17:12:18 +00:00
Todd Poynor
a807dbaeed am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:12:11 +00:00
Raph Levien
ece5bc9d69 am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '7b6b85d260fb4fe739e0af0cc0328e0678872899':
  Re-initialize error after attach
 2014-01-06 17:08:56 +00:00
Raph Levien
7b6b85d260 am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach
 2014-01-06 09:06:06 -08:00
Raph Levien
d7d0749805 am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
  Re-initialize error after attach
 2014-01-06 09:04:03 -08:00
Raph Levien
a980c7aa3e Merge "Re-initialize error after attach" 2014-01-06 17:00:49 +00:00
Alan Viverette
3bb64aa83a Merge "Allow Views to specify a theme override" 2014-01-04 02:31:10 +00:00
Alan Viverette
197315e390 Use layers for reveal drawable 
Change-Id: I82887bb0a3994127ec0bd43ac017d51901a40488
 2014-01-03 17:51:01 -08:00
Zhihai Xu
2208e652d6 Merge "NPE in BluetoothSocket.write()" 2014-01-04 00:54:02 +00:00
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
 2014-01-03 16:30:25 -08:00
Alan Viverette
dd9233253b Allow Views to specify a theme override 
During inflation, any view with a theme attribute will wrap its context
with a theme override. Views inflated using a parent will inherit the
wrapped context.

BUG: 12178430
Change-Id: I3448e5174e94c19960a1e21df5bd6127d0d33c07
 2014-01-03 15:22:53 -08:00
Chris Craik
d218a92c0a Use const where possible for drawing parameters 
They should never be modified by a Renderer, only read and copied.

Change-Id: I9d8d55dca19115ee9dfeb2bb3f092ba2fb327cd4
 2014-01-03 13:55:08 -08:00
Chris Craik
8523706236 Merge "Fix Clang warnings/errors" 2014-01-03 21:35:31 +00:00
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
Chris Craik
564acf7c9b Fix Clang warnings/errors 
Fix several build warnings (struct != class, int != size_t) and errors
(variable leng non-POD arrays).

Change-Id: I70b4e784365514303d8954bfcb1f39d7c22c1321
 2014-01-02 16:52:32 -08: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
Jean-Michel Trivi
b3ae913115 Fix RemoteController synchronization mode 
Fix erroneous argument check in RemoteController syncrhonization
  mode setter..

Bug 12189375

Change-Id: Ib446a21f36c6e0e97752336b22aff0feb651f215
 2014-01-02 23:13:48 +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