Christopher Tate
176d105d2f
Merge "Don't set the time zone under the caller's identity" into jb-mr1-dev
2012-08-31 14:47:35 -07:00
Christopher Tate
897798225d
Don't set the time zone under the caller's identity
...
...otherwise you crash trying to send a broadcast to all users.
Change-Id: If627eeb3eadb1052242c986fe24482d87c8fc093
2012-08-31 14:44:25 -07:00
Jim Miller
58a2950b66
Merge "Lots of keyguard improvements - Fix "too many attempts" dialogs - Fix account unlock mechanism so the user can use email account as backup for pattern unlock - Add mechanism to support future account recovery from non-pattern screen - Tune animation timing for flipping security view. - Move password field to the top of the security view - Add padding and visual feedback to navigation area button" into jb-mr1-dev
2012-08-31 13:57:27 -07:00
Daniel Sandler
8c890f8a69
Merge "Work around instability of Display.getRotation()." into jb-mr1-dev
2012-08-31 12:06:42 -07:00
Daniel Sandler
7f3cf9586e
Work around instability of Display.getRotation().
...
Ensures that the navigation buttons are properly oriented
each time the screen comes on.
Bug: 7086018
Change-Id: Iac6243792a8c64001ff7409108fb892bd470e4c4
2012-08-31 14:58:13 -04:00
Sascha Prueter
6beee2694c
am a3503f26: am 6ee6615d: Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev
...
* commit 'a3503f2688c69b49a309763d8da7e7c04327d6d7':
Revert "Update Back softkey icon Bug: 6020915"
2012-08-31 11:46:13 -07:00
Sascha Prueter
a3503f2688
am 6ee6615d: Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev
...
* commit '6ee6615d8f923a68021d04dc06b20d72c3f8498a':
Revert "Update Back softkey icon Bug: 6020915"
2012-08-31 11:43:59 -07:00
Sascha Prueter
6ee6615d8f
Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev
2012-08-31 11:40:52 -07:00
Sascha Prueter
f14f01cc26
Revert "Update Back softkey icon Bug: 6020915"
...
This reverts commit 962daf9b1c4b12aff68a137472b6a7f4db123c65
Change-Id: If60099643336e35fe5bf7dcbf68a419bcd7ebae3
2012-08-31 11:39:44 -07:00
Adam Powell
9ecd02bfb9
am b9445141: (-s ours) am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
...
* commit 'b94451411bbdea42eb61ece08c1d759e0b1bf177':
DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
2012-08-31 11:29:45 -07:00
Adam Powell
b94451411b
am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
...
* commit 'f1faf7743f39f56cc57d6f2a520e5c8ecf4e58b5':
DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
2012-08-31 11:27:31 -07:00
Adam Powell
89bc8636c5
Merge "Add an OnDismissListener to AutoCompleteTextView" into jb-mr1-dev
2012-08-31 11:26:54 -07:00
Adam Powell
f1faf7743f
Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev
2012-08-31 11:24:30 -07:00
Adam Powell
39263601cc
DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
...
Bug 7088494
Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
2012-08-31 11:16:11 -07:00
Adam Powell
f4247c250d
Merge "GestureDetector - Mask action when checking POINTER_UP" into jb-mr1-dev
2012-08-31 11:13:16 -07:00
Adam Powell
f90165aeda
GestureDetector - Mask action when checking POINTER_UP
...
Bug 7088494
Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
2012-08-31 11:11:39 -07:00
Jeff Brown
00453e7a01
Merge "Tweak overlay display adapter scaling." into jb-mr1-dev
2012-08-31 00:41:15 -07:00
Baligh Uddin
0cc2e9b2e9
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-30 22:16:42 -07:00
Jim Miller
258341c377
Lots of keyguard improvements
...
- Fix "too many attempts" dialogs
- Fix account unlock mechanism so the user can use email account as backup for pattern unlock
- Add mechanism to support future account recovery from non-pattern screen
- Tune animation timing for flipping security view.
- Move password field to the top of the security view
- Add padding and visual feedback to navigation area button
Fixes bugs 7088482, 7088631
Change-Id: I23099feae3b7446ec291d8f860601bfc12f9edd8
2012-08-30 21:40:44 -07:00
rich cannings
a2875f481b
Merge "Notify verifiers that verification is complete" into jb-mr1-dev
2012-08-30 20:35:08 -07:00
Chet Haase
6cab6005a8
Merge "Make detachViewFromParent more robust" into jb-mr1-dev
2012-08-30 19:54:32 -07:00
Adam Powell
b2fc49bceb
Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev
2012-08-30 18:25:39 -07:00
Wink Saville
a559f8826f
am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns"
...
* commit '0e90f738aa82d9b30e6b4f43cd321e3f9cad2fc1':
Fix code problem in writePidDns
2012-08-30 18:16:30 -07:00
Wink Saville
0e90f738aa
am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns"
...
* commit 'f5311768e3dfdc6be60288363da4f120b0c88e28':
Fix code problem in writePidDns
2012-08-30 18:14:15 -07:00
Wink Saville
f5311768e3
am 0dab1a19: Merge "Fix code problem in writePidDns"
...
* commit '0dab1a198e19c9993897b031d425a61a3bfec562':
Fix code problem in writePidDns
2012-08-30 18:11:30 -07:00
Adam Powell
dc2cf24ecf
Integrate new assets from UX that include layout bounds.
...
Change-Id: I682b3f693d8eedb741ea689f56363532cde32132
2012-08-30 18:06:38 -07:00
Adam Powell
780c491fb9
Add an OnDismissListener to AutoCompleteTextView
...
Bug 4551310
Change-Id: I702301ad3360828ec6637b6c09789e00d9661271
2012-08-30 17:46:11 -07:00
Chet Haase
ca479d468b
Make detachViewFromParent more robust
...
Calling detachViewFromParent() without calling remove or attach in the
same drawing frame could, in some situations, cause a crash in the native
DisplayList code. detach/attach are intended to be very lightweight and do
not manage the native DisplayList content the same way that add/remove do.
Nor do they cause an invalidate() or requestLayout(), which would cause the
native structures to get recreated appropriately.
This fix makes this process more robust in two ways:
- DisplayLists should not get finalized (therefore destroying their native
structures) when there are still parent DisplayLists referring to them
(each DisplayList keeps references to its child DisplayLists). This will
prevent the native crash associated with unmatched detach*() calls.
- The docs for detach/attach have been enhanced to make it easier for
developers to understand how to use these methods more correctly and
successfully.
Issue #7064818 detachViewFromParent() should be more robust
Change-Id: I53befc04d5d58c225060f397725566d470488c9b
2012-08-30 17:36:54 -07:00
Wink Saville
0dab1a198e
Merge "Fix code problem in writePidDns"
2012-08-30 17:36:06 -07:00
Amith Yamasani
f203aeef99
Enforce permissions for calls with specified userId
...
Fix a couple of places where incorrect userIds were being passed in.
Change-Id: I398c676e0488ff7e584be96e96c8b32652134238
2012-08-30 16:08:23 -07:00
Dianne Hackborn
b2dd4e87ae
am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
...
* commit '1a907db07ea105ea65e146713f436ed072d7084b':
Added check of ActivityInfo launch mode when starting activity.
2012-08-30 16:04:19 -07:00
Dianne Hackborn
1a907db07e
am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
...
* commit '862c383530d64e6c493fb519f567dd5778d9d48c':
Added check of ActivityInfo launch mode when starting activity.
2012-08-30 16:01:59 -07:00
rich cannings
d1b5cfc94a
Notify verifiers that verification is complete
...
Send the Intent.ACTION_PACKAGE_VERIFIED to all verifiers when
verification is complete (either one verifier verified the package or a
timeout occurred). Details of what occurred is in a new extra,
PackageManager.EXTRA_VERIFICATION_RESULT.
Bug: 7048930
Change-Id: I4f9855a29b0eb6d77f469891402c69e2e8922945
2012-08-30 16:00:59 -07:00
Dianne Hackborn
862c383530
am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."
...
* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
Added check of ActivityInfo launch mode when starting activity.
2012-08-30 15:59:40 -07:00
Romain Guy
0fa814d7e6
Merge "Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set" into jb-mr1-dev
2012-08-30 15:26:57 -07:00
Romain Guy
fbb4321b94
Don't quickReject() children if FLAG_CLIP_CHILDREN isn't set
...
External report: http://code.google.com/p/android/issues/detail?id=36788
Change-Id: Ibdaecf37ab013e30b16e9dc7a6e50156d72c3e4f
2012-08-30 15:19:27 -07:00
Dianne Hackborn
4b60a8d1b8
Merge "Added check of ActivityInfo launch mode when starting activity."
2012-08-30 15:19:03 -07:00
Dianne Hackborn
73365695e4
Merge "Improve multi-user broadcasts." into jb-mr1-dev
2012-08-30 14:56:11 -07:00
John Reck
d02239d1c0
am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
...
* commit '30b5bea07b7357b5063a12e54f002adae9af2b39':
DO NOT MERGE Remove dead code
2012-08-30 14:55:55 -07:00
Teng-Hui Zhu
4dc187b43a
Merge "Fix a typo in the sample code" into jb-mr1-dev
2012-08-30 14:54:24 -07:00
John Reck
30b5bea07b
am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
...
* commit '6fdd49630834b1c20a781c9d29b241a68d1289ef':
DO NOT MERGE Remove dead code
2012-08-30 14:53:42 -07:00
Maxim Siniavine
92c0e3757d
Merge "Fixed MemoryUsage issue with reporting results." into jb-mr1-dev
2012-08-30 14:52:23 -07:00
John Reck
6fdd496308
Merge "DO NOT MERGE Remove dead code" into jb-dev
2012-08-30 14:50:17 -07:00
Teng-Hui Zhu
a242deb1de
Fix a typo in the sample code
...
Change-Id: I27ee1b0ef8abf5decefae1ec1706a9f142016344
2012-08-30 14:36:58 -07:00
Dianne Hackborn
5ac72a2959
Improve multi-user broadcasts.
...
You can now use ALL and CURRENT when sending broadcasts, to specify
where the broadcast goes.
Sticky broadcasts are now correctly separated per user, and registered
receivers are filtered based on the requested target user.
New Context APIs for more kinds of sending broadcasts as users.
Updating a bunch of system code that sends broadcasts to explicitly
specify which user the broadcast goes to.
Made a single version of the code for interpreting the requested
target user ID that all entries to activity manager (start activity,
send broadcast, start service) use.
Change-Id: Ie29f02dd5242ef8c8fa56c54593a315cd2574e1c
2012-08-30 14:33:22 -07:00
Adam Powell
6c16d030cd
am 3dda2cff: (-s ours) am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
...
* commit '3dda2cffafd94f7f9885efae1c9dc06bc3a625f0':
DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:33:14 -07:00
Adam Powell
029d4eb5b2
am 00925a3b: (-s ours) am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
...
* commit '00925a3b883080fa6888ae9905394fc786465d26':
DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:31:33 -07:00
Adam Powell
3dda2cffaf
am ecb388ef: Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
...
* commit 'ecb388efefc427c3fa93f07fd11502564dc194a5':
DO NOT MERGE - Use focal point for scrolling in GestureDetector
2012-08-30 14:30:49 -07:00
Adam Powell
00925a3b88
am d33b6217: DO NOT MERGE - New implementation for ScaleGestureDetector
...
* commit 'd33b6217fc128652a72f1626bcaa5f3b754102c6':
DO NOT MERGE - New implementation for ScaleGestureDetector
2012-08-30 14:29:02 -07:00
Adam Powell
ecb388efef
Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev
2012-08-30 14:28:17 -07:00