Romain Guy
ac56414b92
am b4d4d687: am 318ae7bb: Take SkBitmap\'s stride into account when uploading textures Bug #10151807
...
* commit 'b4d4d68795a10401e3cb50df491a2e5d5b1ac96e':
Take SkBitmap's stride into account when uploading textures Bug #10151807
2013-09-25 15:37:41 -07:00
Romain Guy
b4d4d68795
am 318ae7bb: Take SkBitmap\'s stride into account when uploading textures Bug #10151807
...
* commit '318ae7bb92869d99a05388c598ad105e7aa4cdbd':
Take SkBitmap's stride into account when uploading textures Bug #10151807
2013-09-25 15:34:31 -07:00
Leon Scroggins III
afbd777fda
am ae1e8855: am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev
...
* commit 'ae1e88553fa628dbf22aa5ed2659f5ea2c12793a':
Update docs to state that mark is no longer called.
2013-09-25 15:33:54 -07:00
Romain Guy
318ae7bb92
Take SkBitmap's stride into account when uploading textures
...
Bug #10151807
Change-Id: I7ba4804fa3619088fea70eb55f10519fff0bf5f0
2013-09-25 22:31:31 +00:00
Leon Scroggins III
ae1e88553f
am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev
...
* commit '8e4b16d67851ad5eb91c82955b3c3d59f0770b6b':
Update docs to state that mark is no longer called.
2013-09-25 15:30:55 -07:00
Leon Scroggins III
8e4b16d678
Merge "Update docs to state that mark is no longer called." into klp-dev
2013-09-25 22:27:25 +00:00
Alan Viverette
e4b0a9a940
am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev
...
* commit '607ea331ebe6f133a7e95a0e37d4c00085646708':
Fix caption rendering
2013-09-25 15:26:57 -07:00
Alan Viverette
607ea331eb
am 812b6426: Merge "Fix caption rendering" into klp-dev
...
* commit '812b64264176cb8a253a8253074bc9595503d2ac':
Fix caption rendering
2013-09-25 15:23:50 -07:00
Alan Viverette
812b642641
Merge "Fix caption rendering" into klp-dev
2013-09-25 22:21:08 +00:00
Winson Chung
4516798862
Moving Launcher permission to Framework. (Bug 10343529)
...
Change-Id: Ic48c254c844e65171b5f92d81272962cdc673acc
2013-09-25 15:20:14 -07:00
Jeff Sharkey
e66c1778f8
Require that persistable Uri permissions be taken.
...
Change our Intent flag to indicate that a Uri permission grant is
persistable, but don't actually persist it until explicitly taken by
the receiving app. This prevents apps from spamming each other if
persisted permissions aren't really required.
Remember the last time a persisted grant was taken by an app, and
use this to prune away the oldest grants when the number of grants
grows too large. Allow apps to query persisted grants they are
holding, and allow them to release previously persisted grants. Add
public UriPermission class to return grant details and timestamp.
Track various permission strengths separately, and combine together
after each mutation pass. Persistable grants are currently treated
like global grants, but they could be moved to have owners in the
future. Require that grant holders trying to extend a persistable
permission actually hold a persistable permission themselves.
Bug: 10835779
Change-Id: I95b2f797c04ce7fd2612f9a644685dbd44e03759
2013-09-25 15:16:41 -07:00
Jim Miller
a18b561dee
am 964fb590: am 3264ec7a: Merge "Fit and finish for navbar camera affordance" into klp-dev
...
* commit '964fb590b08c53f36c0368c973b6a6b1f2a76bfb':
Fit and finish for navbar camera affordance
2013-09-25 15:10:55 -07:00
John Spurlock
cfab990053
New battery meter view bolt shape + color.
...
Bug:10785785
Change-Id: Ia122bcaec1137ba45648ab3c97d8ec832fd26c85
2013-09-25 18:08:52 -04:00
Jim Miller
964fb590b0
am 3264ec7a: Merge "Fit and finish for navbar camera affordance" into klp-dev
...
* commit '3264ec7ab5efe8592523a68d4b69c5f2f8f514da':
Fit and finish for navbar camera affordance
2013-09-25 15:07:49 -07:00
Jim Miller
3264ec7ab5
Merge "Fit and finish for navbar camera affordance" into klp-dev
2013-09-25 22:04:49 +00:00
Leon Scroggins III
321bc46b3c
Update docs to state that mark is no longer called.
...
BUG:6493544
Change-Id: I97a4d90ce2efcd12f8f1cc5b545f822f8e5a5ab0
2013-09-25 18:02:32 -04:00
Jim Miller
138f25d756
Accessibility improvements in keyguard
...
- add accessibility descriptions to camera and search light
- add new onClick handler to simplify launching search and camera
- plumb camera launch through KeyguardService interface
Fixes bug 10914360
Change-Id: Ic85eda9afadba7381be78b477180f7204030cd17
2013-09-25 15:01:19 -07:00
Jim Miller
14176c6c0d
am 132540d1: am d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev
...
* commit '132540d1f5656145639f0206076d1ba63183bbfb':
Fix accessibility for all-caps items in keyguard
2013-09-25 14:58:28 -07:00
Jim Miller
132540d1f5
am d7fdcad2: Merge "Fix accessibility for all-caps items in keyguard" into klp-dev
...
* commit 'd7fdcad22683e6191e92141a7e45e2414fe40a44':
Fix accessibility for all-caps items in keyguard
2013-09-25 14:55:31 -07:00
Jim Miller
d7fdcad226
Merge "Fix accessibility for all-caps items in keyguard" into klp-dev
2013-09-25 21:53:41 +00:00
Jeff Sharkey
0a953478a6
am a0e531bb: am 82b05f59: Merge "Handle null stacks gracefully." into klp-dev
...
* commit 'a0e531bba4716586b17b2cbd99257d1030a974f5':
Handle null stacks gracefully.
2013-09-25 14:49:43 -07:00
Jeff Sharkey
a0e531bba4
am 82b05f59: Merge "Handle null stacks gracefully." into klp-dev
...
* commit '82b05f599bf3c84e53d42599ef257b3e9642855d':
Handle null stacks gracefully.
2013-09-25 14:46:33 -07:00
Jeff Sharkey
82b05f599b
Merge "Handle null stacks gracefully." into klp-dev
2013-09-25 21:43:44 +00:00
Adam Lesinski
5b4ef81f2b
Add Graphics alloc tracking via memtrack
...
Any OpenGL memory reported by /proc/pid/smaps will not be included
in the GPU GL memory count and will be considered Unknown. This is
an artifact of how some memory reporting is done in libmemtrack
and some is done in this module.
bug:10294768
Change-Id: Id8fb63b2e86520f4dbc8410573a509e66b96b13b
2013-09-25 14:41:49 -07:00
Jeff Sharkey
6a20e57411
Handle null stacks gracefully.
...
Bug: 10928395
Change-Id: Ie7c3f7e0eb068ece0cf678a5d6346f18a413856b
2013-09-25 14:39:14 -07:00
Sungmin Choi
67c02390a1
wappush: Use valid index for pdu including garbages
...
For some operators, pdu has garbages. As a result, device does not receive
MMS or operator some requests.
To fix it, use valid index for operators.
Bug: 10492745
Change-Id: Ic7262f7369403bd060d94c5da0e09f18c96ff3db
2013-09-25 14:32:44 -07:00
Rob Tsuk
3ccf331fde
Replace blue pressed feedback with gray.
...
Change-Id: I72070411fedd2883417310197ee86e0ad958a899
2013-09-25 14:24:39 -07:00
Vinit Deshapnde
6add2a8337
am 3d837d23: am e7d6bbd6: Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev
...
* commit '3d837d23c5910123330fbe6d18256ecc56ac7fcb':
Fix an incorrectly created race accessing Wifi Supplicant
2013-09-25 14:16:19 -07:00
Marco Nelissen
55a701e923
am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-dev
...
* commit '3fa1d013a297605db9c8e2a4ef71f5bf9c888a24':
Fix hang
2013-09-25 14:16:15 -07:00
Vinit Deshapnde
3d837d23c5
am e7d6bbd6: Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev
...
* commit 'e7d6bbd67fbf50fdff87d1bee67e3410904867c5':
Fix an incorrectly created race accessing Wifi Supplicant
2013-09-25 14:11:04 -07:00
Marco Nelissen
3fa1d013a2
am d7b5f3da: Merge "Fix hang" into klp-dev
...
* commit 'd7b5f3dab1c3bc0aa98698314183149426559a3c':
Fix hang
2013-09-25 14:11:01 -07:00
Vinit Deshapnde
e7d6bbd67f
Merge "Fix an incorrectly created race accessing Wifi Supplicant" into klp-dev
2013-09-25 21:07:51 +00:00
Marco Nelissen
d7b5f3dab1
Merge "Fix hang" into klp-dev
2013-09-25 21:06:47 +00:00
Zhijun He
2001188be3
Camera2: Implement CameraManager#getCameraCharacteristics
...
Bug: 10904541
Bug: 10360518
Change-Id: I1da0b0319703fda46789f15a232e56ed1d928bc3
2013-09-25 13:54:25 -07:00
Marco Nelissen
fd2e50086c
Fix hang
...
b/10855561
Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
2013-09-25 13:45:41 -07:00
Eino-Ville Talvala
7b388f9035
am 6934e994: am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
...
* commit '6934e994a0b7e6c950df151690f0840075fec432':
Camera2: Add PASSIVE_UNFOCUSED autofocus state.
2013-09-25 12:38:07 -07:00
Alan Viverette
7fe420f31b
Fix caption rendering
...
Fixed rendering of captions in regions and incorrect caption width
measurement. Removes minimum-difference line wrapping, since the
results weren't consistent with StaticLayout's rendering.
BUG: 10917766, 10822229
Change-Id: I55ef28cbf383fd6b945c0be62e440781288364f1
2013-09-25 12:35:00 -07:00
Eino-Ville Talvala
6934e994a0
am 9ca833f4: Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
...
* commit '9ca833f4a5eca732b1618bc1a183215c21ae11e5':
Camera2: Add PASSIVE_UNFOCUSED autofocus state.
2013-09-25 12:32:53 -07:00
Eino-Ville Talvala
9ca833f4a5
Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev
2013-09-25 19:28:03 +00:00
Daniel Sandler
ae5dd2a66c
Updated quick settings assets.
...
Bug: 10825585
Change-Id: Idc312960fa4b6fcb350c256fee3a503c0c40e6f3
2013-09-25 14:59:53 -04:00
Dianne Hackborn
6885d577cb
am 8715dc14: am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
...
* commit '8715dc1401557f5ec068f9214ab0712291a3b403':
Replace SEAndroid with SELinux.
2013-09-25 11:48:40 -07:00
Dianne Hackborn
8715dc1401
am 4213e68f: am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
...
* commit '4213e68f67d59c0912d2a8729fcec4539197756a':
Replace SEAndroid with SELinux.
2013-09-25 11:45:38 -07:00
Dianne Hackborn
4213e68f67
am 3a7d5f71: Merge "Replace SEAndroid with SELinux."
...
* commit '3a7d5f71456b57f712b0f878beb5317f0ce6d564':
Replace SEAndroid with SELinux.
2013-09-25 11:42:07 -07:00
Dianne Hackborn
3a7d5f7145
Merge "Replace SEAndroid with SELinux."
2013-09-25 18:39:58 +00:00
Mike Lockwood
90079ba97a
Merge "Cleanup Binder interface between sensorservice and BatteryStats"
2013-09-25 16:56:00 +00:00
Mike Lockwood
488bb0ed6a
Cleanup Binder interface between sensorservice and BatteryStats
...
Change-Id: I6ba542cea242e252864d562ba62f3b8136f09f90
2013-09-25 09:27:18 -07:00
Baligh Uddin
7ee0edac09
am 39d07b27: (-s ours) am 1b87107b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '39d07b2748cd388e7b8540a090ef455b965546ba':
Import translations. DO NOT MERGE
2013-09-25 09:26:36 -07:00
Baligh Uddin
d073e2de2f
am 721e53e8: (-s ours) am 99296322: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '721e53e86b759a77e2f590e3586c76da577df1ae':
Import translations. DO NOT MERGE
2013-09-25 09:26:33 -07:00
Baligh Uddin
9f6765eadc
am 467b5bee: (-s ours) am cb94b3ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '467b5bee65bb1d75b80d88f033c22611e57b429f':
Import translations. DO NOT MERGE
2013-09-25 09:26:30 -07:00
Baligh Uddin
6d4c93a907
am 6ba26547: (-s ours) am 9832b08a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '6ba265479494a369b2c376b5c18d7fd308204b89':
Import translations. DO NOT MERGE
2013-09-25 09:26:28 -07:00