35651 Commits

Author SHA1 Message Date
Will Haldean Brown
11c51608ee am bd79652a: Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev
* commit 'bd79652a9afeee1e81f0f51d11e5869091f58af9':
  Add swipe-to-dismiss support to PhoneWindow.
2014-03-04 21:27:11 +00:00
Will Haldean Brown
bd79652a9a Merge "Add swipe-to-dismiss support to PhoneWindow." into klp-modular-dev 2014-03-04 21:22:30 +00:00
John Spurlock
76ee9b727a am 3b869238: am c6ecac77: am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '3b86923854069fa1b3bcabc8643a5e2db40d7b10':
  Volume panel should not clear system ui flags.
2014-03-04 20:36:56 +00:00
John Spurlock
3b86923854 am c6ecac77: am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit 'c6ecac77cfa35bbc72a4b7e1e3374ad00f83b305':
  Volume panel should not clear system ui flags.
2014-03-04 19:19:14 +00:00
John Spurlock
c6ecac77cf am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit '38f81ccc768958b1a9100cb2caa93ec3aedd9b5e':
  Volume panel should not clear system ui flags.
2014-03-04 19:15:56 +00:00
John Spurlock
38f81ccc76 am fee6f69e: Merge "Volume panel should not clear system ui flags." into klp-dev
* commit 'fee6f69e8321c3f94c2b341fe483f7b1f6534169':
  Volume panel should not clear system ui flags.
2014-03-04 19:12:40 +00:00
Will Haldean Brown
ca6234e084 Add swipe-to-dismiss support to PhoneWindow.
This adds a new window feature -- FEATURE_SWIPE_TO_DISMISS -- and a
theme attribute to activate that feature. When the feature is
activated, a SwipeDismissLayout is inflated as the DecorView layout.
SwipeDismissLayout intercepts touch events and steals ones that are
large swipes to the right if its children don't. PhoneWindow registers
handlers that listen for these swipe events, translate the window when
necessary, and finish the activity at the end of the gesture.

Change-Id: I512e758f3c3ffd3b353dba3b911c0e80a88d6f5f
2014-03-04 09:26:15 -08:00
John Spurlock
ca4d040342 Volume panel should not clear system ui flags.
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.

Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.

Reverts part of I25f29af5b6518aba695b64a75977ae240b742118

Bug:11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
2014-03-04 10:12:01 -05:00
Jay Shrauner
1fdcab956d am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '81f74c7d427f2942cdccae30329694e9825f5d8f':
  Catch ActivityNotFoundException in quick contacts badge
2014-03-03 22:16:50 +00:00
Jay Shrauner
81f74c7d42 am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '7e3efa82ecbb9e3cf50f8f455e573aed3b88d183':
  Catch ActivityNotFoundException in quick contacts badge
2014-03-03 22:05:02 +00:00
Jay Shrauner
7e3efa82ec am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
  Catch ActivityNotFoundException in quick contacts badge
2014-03-03 22:02:14 +00:00
Jay Shrauner
1f168fd438 am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge
2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93 Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 2014-03-03 21:56:18 +00:00
Jonathan Dixon
6ab920fb61 am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
* commit '5b741144a6feadb5c51fecb0235c605f0b9fb803':
  DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 21:16:47 +00:00
Bart Sears
5a0a37e23d am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
* commit '73eefce3085a0fbe3ab65e69af319b21b92c7252':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 21:16:43 +00:00
Jonathan Dixon
5b741144a6 am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
* commit '3c88a685021a5acd099dc7625a11e8d98f0e8fbe':
  DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 20:33:20 +00:00
Bart Sears
73eefce308 am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
* commit '7f9503267c7ad49f6364bd132bc6259e346b7b51':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 20:33:16 +00:00
Jonathan Dixon
3c88a68502 am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
* commit '7c01f9f7abd9eb1aefdf712be98d57e4075422bb':
  DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 20:29:46 +00:00
Bart Sears
7f9503267c am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
* commit 'e31c05296d8cde8f6d99f18ef039fd6823ec54a9':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 20:29:43 +00:00
Jonathan Dixon
7c01f9f7ab am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
  DO NOT MERGE: Fix build after checkThread fix merge to master
2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a DO NOT MERGE: Fix build after checkThread fix merge to master
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.

Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba709273b3d46a1ef3b091eb2292c917)

Cherry pick to klp-dev as part of Bug: 13246014
2014-03-03 18:48:00 +00:00
Primiano Tucci
f4e2723244 DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
2014-03-03 18:01:53 +00:00
John Spurlock
d708b2f12b am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter.
* commit 'e3a6a7b4693e6efd29f973c8cfe91f5778f847f4':
  Doc fixups to ContentResolver, MediaRouter.
2014-03-03 17:07:22 +00:00
John Spurlock
e3a6a7b469 am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter.
* commit '841aa8db20d09d80cd71ef2ed8eaebd4ebccfcc5':
  Doc fixups to ContentResolver, MediaRouter.
2014-03-03 17:04:01 +00:00
John Spurlock
841aa8db20 am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter.
* commit '5237a792aabaa49063b15cefa26f0341ea9cd311':
  Doc fixups to ContentResolver, MediaRouter.
2014-03-03 17:00:49 +00:00
John Spurlock
5237a792aa am 8c44c394: Doc fixups to ContentResolver, MediaRouter.
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
  Doc fixups to ContentResolver, MediaRouter.
2014-03-03 16:57:22 +00:00
John Spurlock
8c44c394bf Doc fixups to ContentResolver, MediaRouter.
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
2014-03-03 10:14:41 -05:00
Yorke Lee
535c9e74d3 Catch ActivityNotFoundException in quick contacts badge
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)
2014-03-01 18:07:22 +00:00
Tim Kilbourn
c405bae90d am 7071786e: Clear child FragmentManagers when destroying Fragments.
* commit '7071786e0074bea42b01236f817383cab69c1b63':
  Clear child FragmentManagers when destroying Fragments.
2014-02-28 20:13:11 +00:00
Tim Kilbourn
7071786e00 Clear child FragmentManagers when destroying Fragments.
If Fragment has instantiated a child FragmentManager and is later
detached, it retains its reference to the child FragmentManager which
has been destroyed. This causes an IllegalStateException in the
child FragmentManager if the original Fragment is reattached.

Fixes Issue 42601.

Change-Id: I8db2b1a110a341dc259939723f4c5ec131ca5f1e
2014-02-28 01:05:17 -08:00
Narayan Kamath
9fc8e6fe8f am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
2014-02-27 13:19:15 +00:00
Craig Mautner
d4c819c002 am dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit 'dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
  Clean up activities and displays when done
2014-02-25 18:49:37 +00:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
2014-02-25 10:40:18 -08:00
Hui Lu
eeb291b7f3 am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.
2014-02-25 17:56:42 +00:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Narayan Kamath
2d19d202bd Make getAssetInt throw unconditionally.
All callers have been moved over to getNativeAsset, and
this method has been hidden from the public API internally.

Change-Id: I5f29b5ddb4449adadf426e49a4085c7320289a15
2014-02-25 15:48:07 +00:00
Craig Mautner
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
2014-02-22 07:33:24 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
2014-02-21 21:08:00 -08:00
Greg Hackmann
0cab896a98 resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
2014-02-21 16:35:52 -08:00
Greg Hackmann
bbfc08b3ab Merge changes I6d4fdada,Ia34899a4
* changes:
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-21 21:01:00 +00:00
Greg Hackmann
38bf514668 Move time setting code from SystemClock to AlarmManagerService
On devices using /dev/rtc instead of /dev/alarm, updating the
time-of-day clock and RTC are separate syscalls.  Hence the clock and
RTC could be left in inconsistent states if two threads called
SystemClock.setCurrentTimeMillis() simultaneously.

By moving this code into AlarmManagerService, we can put a global lock
around AlarmManagerService.setTime() and prevent the race condition.

Note that access to SystemClock.setCurrentTimeMillis() is now gated by
android.permission.SET_TIME, where before it was gated by filesystem
permissions (i.e., could the process write to /dev/alarm or /dev/rtc).

Change-Id: Ia34899a4cde983656305fd2ef466dfe908ed23c8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-02-21 09:53:19 -08:00
Elliott Hughes
d7d37256c4 am b2f07b27: am 4a809272: Merge "Fix documentation for Parcel.readException()."
* commit 'b2f07b27725bed9716114c46df2cf636eb366f6f':
  Fix documentation for Parcel.readException().
2014-02-21 17:28:54 +00:00
Elliott Hughes
e253b514f4 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
2014-02-21 17:28:51 +00:00
Elliott Hughes
4a80927241 Merge "Fix documentation for Parcel.readException()." 2014-02-21 17:21:52 +00:00
Elliott Hughes
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
Narayan Kamath
25c55ca902 am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class
2014-02-21 16:47:43 +00:00
Ashok Bhat
42f06b0e22 Remove unused JNITest class
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.

JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).

Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-21 14:34:35 +00:00
Jeff Brown
90506a41c6 am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
* commit '07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65':
  Add a new "doze mode" based on Dream components.
2014-02-20 21:47:08 +00:00