Adam Powell
c41fa70827
am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
...
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
onWindowDismissed API cleanup
2014-05-06 20:20:40 +00:00
Adam Powell
a0516e7ad1
Merge "onWindowDismissed API cleanup" into klp-modular-dev
2014-05-06 20:17:31 +00:00
Adam Powell
117b695222
onWindowDismissed API cleanup
...
Move the window swipe to dismiss plumbing off of Window.Callback into
its own internal interface implemented by Activity and Dialog. Make it
internal API instead of public. Apps should control this via the
window feature setting.
Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a
2014-05-05 18:20:47 -07:00
Justin Koh
f99fc5405e
am 34f930f3: Fix build due to docs bug. DO NOT MERGE
...
* commit '34f930f3b591f08ee4be8c2f54ee602cabdacc33':
Fix build due to docs bug. DO NOT MERGE
2014-05-06 00:06:58 +00:00
Justin Koh
9241a8d681
am 8031fa01: Fix build due to @deprecated tag not having content
...
* commit '8031fa014cd9f8bb9eb7de47b76a732cdfade687':
Fix build due to @deprecated tag not having content
2014-05-06 00:03:04 +00:00
Justin Koh
34f930f3b5
Fix build due to docs bug. DO NOT MERGE
...
Fix build due to docs bug: needed to remove reference to stopMethodTracingSampling.
Change-Id: I878357b638b3862aecb4bc9d32ee166840b6c796
2014-05-06 00:01:18 +00:00
Justin Koh
8031fa014c
Fix build due to @deprecated tag not having content
...
Bug: 14441321
Change-Id: Ia42040db7030e4318ed2c34bbe90808a49f002db
2014-05-05 16:29:52 -07:00
Justin Koh
8b98c21307
am bebfcb93: Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev
...
* commit 'bebfcb93ef97095a7caa1f80a0b1b05a04e9fd8c':
Hide startMethodTracingSampling DO NOT MERGE
2014-05-05 23:18:26 +00:00
Justin Koh
7b529fcd6d
am 268f858b: Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev
...
* commit '268f858be57089e568bc55aa9089af54a53dcc94':
Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
2014-05-05 23:18:22 +00:00
Justin Koh
bebfcb93ef
Merge "Hide startMethodTracingSampling DO NOT MERGE" into klp-modular-dev
2014-05-05 23:15:36 +00:00
Justin Koh
268f858be5
Merge "Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE" into klp-modular-dev
2014-05-05 23:14:06 +00:00
Justin Koh
e0cc71fa19
am 1440cc6b: Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev
...
* commit '1440cc6bf37a268b439dfe86a9078b93bf1baf39':
Hide InputDevice#supportsSource DO NOT MERGE
2014-05-05 23:11:03 +00:00
Justin Koh
6f5dcc3546
Hide KeyEvent#isCancelKey, isConfirmKey DO NOT MERGE
...
Bug: 14116162
Change-Id: I6b947c9b46bb5ea094b39428bb432e8f6fc6b57a
2014-05-05 16:08:38 -07:00
Justin Koh
1440cc6bf3
Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-dev
2014-05-05 23:08:15 +00:00
Griff Hazen
36ef0792d2
am ed0c87e7: DO NOT MERGE Hide Notification categories from API 20 (KKWT)
...
* commit 'ed0c87e7cdd2f641b6ed78df62b20a9f08ac16bb':
DO NOT MERGE Hide Notification categories from API 20 (KKWT)
2014-05-05 22:49:51 +00:00
Justin Koh
8bed554e4f
Hide InputDevice#supportsSource DO NOT MERGE
...
Bug: 14116162
Change-Id: I7c0ae516596f965083622aa77281abf6d47dc0b7
2014-05-05 15:47:39 -07:00
Griff Hazen
ed0c87e7cd
DO NOT MERGE Hide Notification categories from API 20 (KKWT)
...
Bug: 14116162
Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae
2014-05-05 15:45:08 -07:00
Justin Koh
fcd2aff48d
am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev
...
* commit '1e822a8fe1f3063aa0d3eb47a7afdda9702c1734':
Hide HDMI CEC from KKWT DO NOT MERGE
2014-05-05 22:42:22 +00:00
Justin Koh
8e4cbcce66
am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev
...
* commit 'f8a10d775efcc1c7255c1e504bf59f7cd38967ef':
Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
2014-05-05 22:42:19 +00:00
Justin Koh
5aa34455d7
am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev
...
* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
Hide UsbDevice changes in KKWT DO NOT MERGE
2014-05-05 22:42:15 +00:00
Justin Koh
8fee5c857b
Hide startMethodTracingSampling DO NOT MERGE
...
Bug: 14116162
Change-Id: I68470f02a2b6c2f0d9a1cb52bb4b7eeea10b43cf
2014-05-05 15:40:00 -07:00
Justin Koh
1e822a8fe1
Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-dev
2014-05-05 22:38:26 +00:00
Justin Koh
f8a10d775e
Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev
2014-05-05 22:38:17 +00:00
Justin Koh
fd04632ab5
am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev
...
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
Hide getDeviceGlobalActionKeyTimeout
2014-05-05 22:38:13 +00:00
Justin Koh
9cb3b162eb
Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev
2014-05-05 22:38:06 +00:00
Justin Koh
3caf925824
Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev
2014-05-05 22:33:29 +00:00
Justin Koh
68ca14648c
am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE
...
* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
Hide NsdServiceInfo additions for KKWT DO NOT MERGE
2014-05-05 22:21:03 +00:00
Justin Koh
e5238f53f0
Hide HDMI CEC from KKWT DO NOT MERGE
...
Hide HDMI CEC from KKWT.
Bug: 14116162
Change-Id: I086a5e51bd848a5097ccb0c47900fde30db2e7aa
2014-05-05 22:19:19 +00:00
Justin Koh
e647dd354e
Hide UsbDevice changes in KKWT DO NOT MERGE
...
Hide UsbDevice changes in KKWT.
Bug: 14116162
Change-Id: I1582b9d536b243fa18beca6fdd8f379f9e32e137
2014-05-05 22:19:05 +00:00
Justin Koh
ed23c5bc12
Hide NsdServiceInfo additions for KKWT DO NOT MERGE
...
Hide NsdServiceInfo additions for KKWT.
Bug: 14116162
Change-Id: I98755a2524168be5e833a634192fd49ff3c32346
2014-05-05 22:18:42 +00:00
Justin Koh
618f30db3e
Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
...
Hide getRequiredPermission in android.hardware.Sensor.
Bug: 14116162
Change-Id: I1e5c8361f6d0710c5da78d9506f70fa40a814b92
2014-05-05 14:51:55 -07:00
Justin Koh
1aa59f86ca
Hide getDeviceGlobalActionKeyTimeout
...
Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from
@deprecated notice.
Bug: 14441321
Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
2014-05-05 14:40:56 -07:00
Craig Mautner
9bb4df3a7d
am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev
...
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
Pause and resume ActivityView when visibility changes
2014-05-05 21:03:39 +00:00
Craig Mautner
d13a558397
Pause and resume ActivityView when visibility changes
...
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.
Fixes bug 14034658.
Change-Id: Icab43678053c225db70f051dceacd4d024df2153
2014-05-05 12:07:40 -07:00
Justin Koh
9abf0b9031
am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
Make global action key timeout configurable.
2014-05-02 17:28:53 +00:00
Justin Koh
feabd2c730
Make global action key timeout configurable.
...
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321
Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
2014-05-02 10:04:34 -07:00
Jeff Brown
4f8cd18880
am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev
...
* commit '7f6ab17d414726868563105cd995b37dd519320b':
Clean up some terminology related to interactive state.
2014-05-01 23:29:13 +00:00
Jeff Brown
140ffc783c
Clean up some terminology related to interactive state.
...
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Mindy Pereira
ed7e36dc2e
am d5e92318: Merge "Update fling min velocity" into klp-modular-dev
...
* commit 'd5e92318b69d8af6d91dc3b51738913595e0f536':
Update fling min velocity
2014-05-01 20:40:08 +00:00
Narayan Kamath
3a951e52d9
resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp
...
Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a
2014-05-01 15:32:20 +01:00
Narayan Kamath
69da8a124e
am 2a9a0471: Merge "Package manager changes for dual zygote stack."
...
* commit '2a9a047140b8da8f9cd7147c8bed60eeb61d1b6a':
Package manager changes for dual zygote stack.
2014-05-01 14:00:43 +00:00
Narayan Kamath
0338af46f9
am 99253c2d: am fde59428: Merge "Handle /oem and /vendor as well"
...
* commit '99253c2da945cbd4725efced6cac2dc40c858d6c':
Handle /oem and /vendor as well
2014-05-01 13:57:21 +00:00
Narayan Kamath
6af42aea72
am 9f34234f: am b916d8ad: Merge "Implement FileUtils#contains."
...
* commit '9f34234f1c0e39ee43c4a86e23d333ba2a30ec0e':
Implement FileUtils#contains.
2014-05-01 13:57:13 +00:00
Narayan Kamath
0349e8c478
Package manager changes for dual zygote stack.
...
- Pass down the app's instruction set to dexopt so that
it can compile the dex file for the right architecture.
- Also pass down the app's instruction set to rmdex, movedex
and getSize so that they can construct the cache file
location properly.
- Temporarily compile "system" jars such as am,wm etc. for
both architectures. A follow up change will ensure that
they're compiled only for one architecture (the same
arch. as the system server).
- Java "shared" libraries are now compiled for the right
architecture when an app requires them.
- Improve the app native library ABI detection to account
for system apps installed in /system/lib{64}/<packagename>
and also handle sdcard and forward locked apps correctly.
(cherry-picked from commit b4d35dc8e9702f9d0d82d35a105f0eea35672b52)
2014-05-01 13:54:48 +00:00
Narayan Kamath
99253c2da9
am fde59428: Merge "Handle /oem and /vendor as well"
...
* commit 'fde594288bff0b8f95567e6b27f273f50f0c5f87':
Handle /oem and /vendor as well
2014-05-01 13:53:08 +00:00
Narayan Kamath
9f34234f1c
am b916d8ad: Merge "Implement FileUtils#contains."
...
* commit 'b916d8adffd7ea3588bc178e1ee03f68f0a409e5':
Implement FileUtils#contains.
2014-05-01 13:52:55 +00:00
Christopher Tate
c84471c2e0
Handle /oem and /vendor as well
...
Bug 13170859
(cherry-picked from commit 740888f62e )
Change-Id: I7b5e206697fcbec146cac6cd83fca5c583a8cbd7
2014-05-01 13:51:33 +00:00
Narayan Kamath
d6d1dbac3f
Implement FileUtils#contains.
...
Partial cherry-pick of changes 4ca728c0 and 21de56a9 , which
can't be cherry-picked due to their large surface area.
Change-Id: Ife46e150d360cd5241dea93863141749233c1805
2014-05-01 14:01:44 +01:00
Mindy Pereira
23ffc73abd
Update fling min velocity
...
Make it configurable for watch
Change-Id: Icf90ebd5bd5924fb2a5beb6715479d5dbe7e7dd9
2014-04-30 17:17:10 -07:00
Michael Wright
474b07497b
am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
...
* commit '809c369892ddbae908dc47e6a1032a768e9004cb':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
2014-04-30 19:11:05 +00:00