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

114685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rachad Alao
5be2d2af80 am 0ed8c93c: am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev 
* commit '0ed8c93cffec6b4d0c1e86599365074b1b2c3f1f':
  Camera2: add metadata override
 2013-10-07 13:46:05 -07:00
Rachad Alao
0ed8c93cff am 00fb27dd: Merge "Camera2: add metadata override" into klp-dev 
* commit '00fb27dda8c74229ea55b524063410842ba4a21e':
  Camera2: add metadata override
 2013-10-07 13:42:52 -07:00
Rachad Alao
00fb27dda8 Merge "Camera2: add metadata override" into klp-dev 2013-10-07 20:40:22 +00:00
Jeff Sharkey
ab5cbb7bb5 am 0e438c2a: am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit '0e438c2a1b4e2de34702ce8332b3853db703dbdb':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:21:21 -07:00
Jeff Sharkey
0e438c2a1b am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit 'a27366efc4cac889ef454b13fa74bb4c4473b2f1':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:19:22 -07:00
Jeff Sharkey
a27366efc4 Merge "Ellipsize titles in middle, otherwise end." into klp-dev 2013-10-07 20:17:54 +00:00
Baligh Uddin
e68c01289e am a67fc7b7: (-s ours) am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a67fc7b7429124909e9dee83062a38e98be2d913':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:59 -07:00
Baligh Uddin
087f350ef8 am bc8b193b: (-s ours) am e7f1a0db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bc8b193b226af08302b2adaf49a68a9f54440f64':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:56 -07:00
Baligh Uddin
1ec95bc5eb am 05f3b6ac: (-s ours) am 79bcca23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '05f3b6ac6507ea67217316e57cd11a8421b74fda':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:53 -07:00
Baligh Uddin
2c5ead86f6 am 4d1fac94: (-s ours) am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4d1fac943f4b8942dbe6347ee221ea23b7081288':
  Import translations. DO NOT MERGE
 2013-10-07 12:49:51 -07:00
Baligh Uddin
c908e97a5c am 917d56c7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '917d56c73f53ec37ed380ee08675a00c98629327':
  Import translations. DO NOT MERGE
 2013-10-07 12:46:18 -07:00
Baligh Uddin
4c9a2c20f8 am 621674dd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '621674dd6444ec852fcce3de3d1df769f9634ec8':
  Import translations. DO NOT MERGE
 2013-10-07 12:46:15 -07:00
Baligh Uddin
2095ebbeff am 43e40459: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '43e404591e5df9f7da4a0b15a5d5853821eb09c8':
  Import translations. DO NOT MERGE
 2013-10-07 12:46:13 -07:00
Baligh Uddin
a67fc7b742 am 6ac16894: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6ac16894a9f24211ceb57de34afbf3e2d7bde7a9':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:49 -07:00
Baligh Uddin
bc8b193b22 am e7f1a0db: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e7f1a0db37ac1b2ffe107774f60bd956d590c2f4':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:46 -07:00
Baligh Uddin
05f3b6ac65 am 79bcca23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '79bcca2311c48552a6fed8b441e65568fc889da8':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:44 -07:00
Baligh Uddin
4d1fac943f am 8cc94767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8cc94767b5d2c5d6f98517fd4fa34b4f31704c63':
  Import translations. DO NOT MERGE
 2013-10-07 12:45:42 -07:00
Baligh Uddin
917d56c73f Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:44:14 +00:00
Baligh Uddin
6ac16894a9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:44:10 +00:00
Baligh Uddin
e7f1a0db37 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:44:02 +00:00
Baligh Uddin
621674dd64 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:43:54 +00:00
Baligh Uddin
79bcca2311 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:43:50 +00:00
Baligh Uddin
43e404591e Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:43:39 +00:00
Baligh Uddin
8cc94767b5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:43:34 +00:00
Eino-Ville Talvala
868d904306 Camera2: Fire all callbacks 
- Allow configureOutputs to be called when device is
   actively working, and document what happens then.
 - At the managed level, trigger proper sequence of callbacks for
   device state changes, for all the callbacks that are not yet
   managed by the camera service.
 - Restructure CameraManager.openDevice to have the device itself fire the
   initial callbacks.
 - Make CameraDevice.configureOutputs(null) work.
 - Make CameraDeviec.configureOutputs(identical surfaces) work.
 - Ensure proper checking for camera closed state.

Bug: 10360518
Change-Id: I9db348ee9c5ce4d3fe02fd34e779acc85cba68dc
 2013-10-07 12:40:49 -07:00
Jeff Sharkey
2c4b99fbe6 Ellipsize titles in middle, otherwise end. 
Long document titles can include distinguishing details at the end
of the title, so ellipsize in the middle.  All other details ellipsize
at the end.

Bug: 11081420
Change-Id: I2c266ebc594d2ad383033b435acb8adb5fb823bc
 2013-10-07 11:39:07 -07:00
Chris Craik
641ac6429a Clean up unused resources 
bug:10641374

Additionally, fixes incorrect getColor use

Change-Id: Ie56ad5baa099cc421629a5dcc8ef9de14e44079a
 2013-10-07 11:00:33 -07:00
Baligh Uddin
8e3e6cb1a1 Import translations. DO NOT MERGE 
Change-Id: I0647ab81e403652058dd10130238ed5fb98911d9
Auto-generated-cl: translation import
 2013-10-07 10:44:10 -07:00
Baligh Uddin
0ea4be04a0 Import translations. DO NOT MERGE 
Change-Id: I4365c56d96fc1e1aa97e05d154ce23441c5b1431
Auto-generated-cl: translation import
 2013-10-07 10:43:11 -07:00
John Spurlock
64157f23d8 am 1fc7bd3e: am 619fc89a: Merge "Fix transparent -> translucent reference in private docs." into klp-dev 
* commit '1fc7bd3eb2ee9598665013c843b4bbd26d74fd26':
  Fix transparent -> translucent reference in private docs.
 2013-10-07 10:10:18 -07:00
John Spurlock
7f106c465b am f2ec90f2: am 2788712a: Merge "Update qs asset outlines." into klp-dev 
* commit 'f2ec90f26ca29f3fe1237f8b593a0f2d6f25de80':
  Update qs asset outlines.
 2013-10-07 10:10:12 -07:00
Jean-Michel Trivi
9633629b79 am 65d57713: am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev 
* commit '65d577139c8093f2a601069bbe05d2e622e0d340':
  Also rely on enabled notification listeners for RemoteController registration
 2013-10-07 10:10:08 -07:00
John Spurlock
1fc7bd3eb2 am 619fc89a: Merge "Fix transparent -> translucent reference in private docs." into klp-dev 
* commit '619fc89aa176a4fa2895933d536987bb278acfb5':
  Fix transparent -> translucent reference in private docs.
 2013-10-07 10:07:19 -07:00
John Spurlock
f2ec90f26c am 2788712a: Merge "Update qs asset outlines." into klp-dev 
* commit '2788712abb3b35cdaed253a2c221b2dd791e95af':
  Update qs asset outlines.
 2013-10-07 10:07:16 -07:00
Jean-Michel Trivi
65d577139c am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev 
* commit 'bacb5422bc4670d2b8905d9f58d068a97836561f':
  Also rely on enabled notification listeners for RemoteController registration
 2013-10-07 10:07:14 -07:00
John Spurlock
619fc89aa1 Merge "Fix transparent -> translucent reference in private docs." into klp-dev 2013-10-07 17:05:01 +00:00
John Spurlock
2788712abb Merge "Update qs asset outlines." into klp-dev 2013-10-07 17:04:39 +00:00
Jean-Michel Trivi
bacb5422bc Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev 2013-10-07 17:04:20 +00:00
Baligh Uddin
a54d00d3a8 Import translations. DO NOT MERGE 
Change-Id: I526647a96dfaad1d0687f84efd9f5b0e7cfcb07b
Auto-generated-cl: translation import
 2013-10-07 09:54:02 -07:00
John Spurlock
9c00a2f304 Update qs asset outlines. 
Bug:10641374
Change-Id: Id4748cf72b4c8c3c59797fc4880926cb4fe57b74
 2013-10-07 12:39:18 -04:00
Baligh Uddin
194d77057b Import translations. DO NOT MERGE 
Change-Id: If41d11e80795a7cac5627f484d84b4c48e7ad956
Auto-generated-cl: translation import
 2013-10-07 09:28:05 -07:00
Baligh Uddin
5c3144b1d5 Import translations. DO NOT MERGE 
Change-Id: Ib5f0a7090f91814f9c5df7da7e96fe492cef100a
Auto-generated-cl: translation import
 2013-10-07 09:26:23 -07:00
John Spurlock
3f7cd517aa Fix transparent -> translucent reference in private docs. 
Bug:10781433
Change-Id: I9e71b38df3909c367c80a9a589d28f703d1c9936
 2013-10-07 12:25:09 -04:00
Baligh Uddin
a5ea69ff28 Import translations. DO NOT MERGE 
Change-Id: Ie31c027871b65270af282ba9253c35be93d7490d
Auto-generated-cl: translation import
 2013-10-07 09:22:06 -07:00
Baligh Uddin
a44c31bda0 Import translations. DO NOT MERGE 
Change-Id: I107cb20c67c52a5d2c6d82cb31f5ac41a75cdf4d
Auto-generated-cl: translation import
 2013-10-07 09:20:44 -07:00
Zhijun He
b7bfdc7cf7 Camera2: add metadata override 
There are interface difference between managed and native side for some
metadata, like Face and JPEG format. we need override them when they are set/get
between native and managed sides.

Also fix some issues in the CameraMetadataTest.

Bug: 10406212

Change-Id: Ibd8be0415968445e711b3ea89f45e1edfa193ee2
 2013-10-07 08:02:25 -07:00
Svetoslav Ganov
b2420c917b The undefined media sizes for both orientations not properly constructed. 
We have constants for an app to specify an undefined media size in portrait
and such in landscape. The constants for these media sizes had the width and
height dimesions swapped.

bug:11099831

Change-Id: Ic09227c3a03429fc5a4a157abc15fea87d3ad8be
 2013-10-06 19:44:19 -07:00
John Spurlock
4818db0fc5 am b88ede00: am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 
* commit 'b88ede00ac12fb359b490a5167cd595ebde7e805':
  Transparent system ui flags -> Translucent WM flags.
 2013-10-06 19:19:18 -07:00
John Spurlock
b88ede00ac am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 
* commit 'd5102f19653f6b00ce872435c5efb5cb630deed7':
  Transparent system ui flags -> Translucent WM flags.
 2013-10-06 19:16:13 -07:00
John Spurlock
d5102f1965 Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev 2013-10-07 02:13:50 +00:00