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

138683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
1e5cf9aced am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev 
* commit 'b1c76a1abcfb2f33e12fef37ec71d20724863b5e':
  Tessellate on worker threads
 2014-06-10 17:22:31 +00:00
Igor Murashkin
f1d758867a am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
  camera2: Fix session-related CTS test failures
 2014-06-10 17:22:22 +00:00
Adam Lesinski
859cd926fe am a277deb7: (-s ours) DO NOT MERGE - Creating an empty package should be succesfull 
* commit 'a277deb755f95ca42e39f8910d958bfd1ceafa55':
  DO NOT MERGE - Creating an empty package should be succesfull
 2014-06-10 17:22:12 +00:00
Jeff Brown
085a1e7933 am af0c2ebf: @hide ACCESS_INPUT_FLINGER permission. 
* commit 'af0c2ebfc71f6106656eb17345e122ea7ac8cf2a':
  @hide ACCESS_INPUT_FLINGER permission.
 2014-06-10 17:21:59 +00:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
 2014-06-10 17:21:52 +00:00
Christopher Tate
4a1c0bd20b am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev 
* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
  Switch framework to using new scheduled-work API
 2014-06-10 17:21:47 +00:00
Fabrice Di Meglio
5ef6f9078a am 821c8331: Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev 
* commit '821c833143d396cf64536eb4938c0d79d1adccc6':
  Fix bug #14258811 Permissions icons are not visible in App info
 2014-06-10 17:21:42 +00:00
Adrian Roos
178e2b98c1 Merge "Add Emergency Calls Only and Charging State to Status Bar Header" 2014-06-10 15:41:15 +00:00
Baligh Uddin
2ad173d891 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:37:54 +00:00
Baligh Uddin
c60aa41104 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:30 +00:00
Baligh Uddin
5f4291c1a5 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:25 +00:00
Baligh Uddin
56f7c59168 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:25 +00:00
Baligh Uddin
291258c880 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:19 +00:00
Matthew Williams
f53c295ae3 am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev 
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.
 2014-06-10 14:55:46 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master 
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
 2014-06-10 07:53:03 -07:00
Adrian Roos
59a6127551 Add Emergency Calls Only and Charging State to Status Bar Header 
Bug: 15393101
Change-Id: If1dc300d843fb5f694ef57714225f43924dbb2b8
 2014-06-10 14:49:10 +02:00
Jeff Sharkey
d734c698e3 am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
  Refactor directory API to "opening document tree."
 2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28 am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
  Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-10 11:18:48 +00:00
Alan Viverette
3b77eb33a5 am 28104981: Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev 
* commit '28104981ea36e96e0c85b735b91583fb344b85c5':
  Optimize use of layers in ripple, update dialog styling
 2014-06-10 11:18:38 +00:00
Alan Viverette
4a00c53800 am 5d5de3ee: Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev 
* commit '5d5de3ee32302ae45f3a01933997a2b838bf6291':
  Use a weak reference to the ObjectAnimator target
 2014-06-10 11:18:30 +00:00
Jeff Brown
11ef6a3b11 am 16eb7133: (-s ours) Add @SystemApi annotation to internal permissions. (DO NOT MERGE) 
* commit '16eb71335edcbe2978e2b2a9e5a69d1458ab03bd':
  Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
 2014-06-10 11:18:19 +00:00
Jeff Brown
260fd18d4d am 1337bac1: (-s ours) Add support for @SystemApi annotation to aapt. (DO NOT MERGE) 
* commit '1337bac111c70ba4ccce21b2c75491ee690954a8':
  Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
 2014-06-10 11:18:14 +00:00
Jeff Brown
1ffcc58c68 am 7296e808: (-s ours) Rename PrivateApi annotation to SystemApi. (DO NOT MERGE) 
* commit '7296e80837cd8e406e04193c239a1441c9f147b0':
  Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
 2014-06-10 11:18:09 +00:00
Michael Wright
66a862c38e am b225171e: (-s ours) Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev 
* commit 'b225171eb981dbd062c6c6b42a963930a31a2a51':
  Pack PointerCoords with BitSet. DO NOT MERGE
 2014-06-10 11:18:02 +00:00
Matthew Williams
3f51a909f0 am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev 
* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
  Add test app for JobScheduler
 2014-06-10 11:17:55 +00:00
Yohei Yukawa
2f4bd692d3 Merge "Use more user actions to update the IME rotation order" 2014-06-10 09:33:13 +00:00
Kenny Guy
ef2b37ea87 Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only." 2014-06-10 08:55:47 +00:00
Chris Craik
9a9d1d5ad2 Merge "Tessellate on worker threads" into lmp-preview-dev 2014-06-10 04:52:12 +00:00
Jungshik Jang
2ae1019c97 Merge "Implement cec message cache." 2014-06-10 04:40:40 +00:00
Jungshik Jang
e81e108c40 Implement cec message cache. 
HDMI bus for CEC is quite slow and it may cause conflict
or timeout during device discovery stage or hot-plug
detection stage. However, some static information, such
as physical address, vendor id or osd name are usually
sent automatically when a device is connected, and
almost never change after updated.

Change-Id: I4df9d27ef1af04ee35d63a764580fed07c32d15d
 2014-06-10 13:39:19 +09:00
Igor Murashkin
3721cbaf01 Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 2014-06-10 04:02:28 +00:00
Adam Lesinski
cbb0213d81 DO NOT MERGE - Creating an empty package should be succesfull 
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
(cherry picked from commit 807efa884ba01e0213667000a21908bfb04e8624)
 2014-06-10 01:56:03 +00:00
Chris Craik
05f3d6e511 Tessellate on worker threads 
Tessellate and cache (where possible) shadow and round rect
tessellation tasks.

Change-Id: I2cfda8e11d83d51ea74af871235cf26e8f831d40
 2014-06-10 01:53:17 +00:00
Jeff Brown
8c90ff3b8a Merge "Delete stale commented out declarations." 2014-06-10 01:43:44 +00:00
Jeff Brown
465c5de4ee @hide ACCESS_INPUT_FLINGER permission. 
Bug: 15516225
Change-Id: Ief70650d956a7161153e283c24f553fcfa7996b1
 2014-06-10 01:43:14 +00:00
Justin Koh
0c4122c9b5 am ce8c1086: am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'ce8c1086fbc42e80056b59d9dbbd6144cb85f20d':
  Add NPE check to getSystemWindowInsets
 2014-06-10 01:30:21 +00:00
Justin Koh
36b0cae955 am 2be4ddc4: am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit '2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0':
  Fix Browser when running on a platform without webview
 2014-06-10 01:30:16 +00:00
Robert Ly
55762575b0 am a60406f5: am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'a60406f5465208079c14770defcfcced10432481':
  remove erroneous file
 2014-06-10 01:30:11 +00:00
Adam Lesinski
3cfe720a0d am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-10 01:30:05 +00:00
Craig Mautner
df8e542a8a Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 2014-06-10 01:29:43 +00:00
Craig Mautner
e1ab884a67 Merge "resolved conflicts for merge of 1e6706ab to master" 2014-06-10 01:27:07 +00:00
Amith Yamasani
8108d7f3bf Merge "Make LocationManagerService aware of user profiles" 2014-06-10 01:20:20 +00:00
Craig Mautner
f357c0ca51 Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK 
Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
 2014-06-09 18:09:33 -07:00
Amith Yamasani
b27528d066 Make LocationManagerService aware of user profiles 
LocationManagerService normally doesn't provide location to background users.
With managed profiles, there are more than one foreground users and they both
need to get location when in the foreground. So LMS will now compare the caller
against all foreground users and provide location if valid.

Bug: 14671472
Change-Id: If3baabfc5a3ab3f2f081d7fc28f35d840d5f1489
 2014-06-09 18:06:20 -07:00
Christopher Tate
d478a3a0d8 Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev 2014-06-10 01:03:52 +00:00
Fabrice Di Meglio
5eba4c5697 Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev 2014-06-10 01:00:45 +00:00
Fabrice Di Meglio
1e70acb9fc Fix bug #14258811 Permissions icons are not visible in App info 
- add updated assets for Material Theme

Change-Id: Iaa1e5787e5245fa5cffe5a07eb612b62ce9573f7
 2014-06-09 17:58:02 -07:00
Mike J. Chen
a565754a81 Merge "Update default android boot animation png files" 2014-06-10 00:55:07 +00:00
Igor Murashkin
e1442204c1 camera2: Fix session-related CTS test failures 
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
 2014-06-09 17:51:24 -07:00
Christopher Tate
115afdadb5 Switch framework to using new scheduled-work API 
Also add the intended permission-use enforcement to said API.

Bug 14994893
Bug 14993295

Change-Id: I5a3ffd32d0702c68f4ef6da68f7fa6e9de674380
 2014-06-09 17:49:50 -07:00