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

85094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sascha Prueter
3a377eb519 am 623232da: am 6beee269: am a3503f26: am 6ee6615d: Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev 
* commit '623232da927a162fc15c4d560f0d49e472926e01':
  Revert "Update Back softkey icon Bug: 6020915"
 2012-08-31 11:50:40 -07:00
Sascha Prueter
623232da92 am 6beee269: am a3503f26: am 6ee6615d: Merge "Revert "Update Back softkey icon Bug: 6020915"" into jb-dev 
* commit '6beee2694c523c39ee9200508996e64fa6e64348':
  Revert "Update Back softkey icon Bug: 6020915"
 2012-08-31 11:48:27 -07: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
c68826c26c am 2556b4ea: (-s ours) am 9ecd02bf: am b9445141: (-s ours) am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev 
* commit '2556b4ea1fad0550d1b694b47644856bd2bb6a4e':
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
 2012-08-31 11:35:09 -07:00
Adam Powell
2556b4ea1f am 9ecd02bf: am b9445141: (-s ours) am f1faf774: Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev 
* commit '9ecd02bfb9265f0849c0060df3dbe777117ae04e':
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
 2012-08-31 11:32:47 -07:00
Adam Powell
ef2bcb7c0c am df9af39a: am 89bc8636: Merge "Add an OnDismissListener to AutoCompleteTextView" into jb-mr1-dev 
* commit 'df9af39a5462f6a1e73829a5800537c3e505b356':
  Add an OnDismissListener to AutoCompleteTextView
 2012-08-31 11:32:07 -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
df9af39a54 am 89bc8636: Merge "Add an OnDismissListener to AutoCompleteTextView" into jb-mr1-dev 
* commit '89bc8636c5aeedd2421ffa4f903e783d4a2a993c':
  Add an OnDismissListener to AutoCompleteTextView
 2012-08-31 11:29:36 -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
9ef7620a9f am 011e0285: am f4247c25: Merge "GestureDetector - Mask action when checking POINTER_UP" into jb-mr1-dev 
* commit '011e0285b2d771eeb6a6e73950e3313a195f13f4':
  GestureDetector - Mask action when checking POINTER_UP
 2012-08-31 11:18:01 -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
011e0285b2 am f4247c25: Merge "GestureDetector - Mask action when checking POINTER_UP" into jb-mr1-dev 
* commit 'f4247c250dd0ce50c8fa4e59bad33d0ba9b68692':
  GestureDetector - Mask action when checking POINTER_UP
 2012-08-31 11:15:18 -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
Baligh Uddin
a219af1ca6 Import translations. DO NOT MERGE 
Change-Id: I3c4f6d1a308dab00871df4b8ba3f633dbe48ac78
Auto-generated-cl: translation import
 2012-08-31 08:44:34 -07:00
Baligh Uddin
aed83ee84f Import translations. DO NOT MERGE 
Change-Id: If32fc3d101fae6ecb8ec9199e632f9fac6eacf53
Auto-generated-cl: translation import
 2012-08-31 08:43:24 -07:00
Baligh Uddin
3d217ad644 Import translations. DO NOT MERGE 
Change-Id: I3989a93943a9b756d8d4816044787e291865a217
Auto-generated-cl: translation import
 2012-08-31 08:36:05 -07:00
Baligh Uddin
464fb99b91 Import translations. DO NOT MERGE 
Change-Id: Ifec4a4a20b1dbe717c83778d48582fc071282fc8
Auto-generated-cl: translation import
 2012-08-31 08:28:20 -07:00
Jeff Brown
51f4f43a57 am 68a6f2a7: am 00453e7a: Merge "Tweak overlay display adapter scaling." into jb-mr1-dev 
* commit '68a6f2a737ce6dc0f418132edbef9cd84e201d1c':
  Tweak overlay display adapter scaling.
 2012-08-31 00:46:00 -07:00
Jeff Brown
68a6f2a737 am 00453e7a: Merge "Tweak overlay display adapter scaling." into jb-mr1-dev 
* commit '00453e7a0182b50cf01e65c97650b526284fe084':
  Tweak overlay display adapter scaling.
 2012-08-31 00:43:56 -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
c689b65bc1 am 09dc35ee: (-s ours) am 0cc2e9b2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '09dc35ee3b127bfec572e570c470d34897a1bf68':
  Import translations. DO NOT MERGE
 2012-08-30 22:22:11 -07:00
Baligh Uddin
09dc35ee3b am 0cc2e9b2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0cc2e9b2e9ff3697388c966d658c9dc5a7293fda':
  Import translations. DO NOT MERGE
 2012-08-30 22:19:30 -07:00
Baligh Uddin
0cc2e9b2e9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-30 22:16:42 -07:00
Baligh Uddin
3af1cf3b23 Merge "Import translations. DO NOT MERGE" 2012-08-30 22:15:03 -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
6c197585c1 am d3fe930d: am a2875f48: Merge "Notify verifiers that verification is complete" into jb-mr1-dev 
* commit 'd3fe930da9199d7fde39e243ba9c695872c0622b':
  Notify verifiers that verification is complete
 2012-08-30 20:39:58 -07:00
rich cannings
d3fe930da9 am a2875f48: Merge "Notify verifiers that verification is complete" into jb-mr1-dev 
* commit 'a2875f481bc40fb5c7e5ae2d475dfb6d557294c0':
  Notify verifiers that verification is complete
 2012-08-30 20:36:56 -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
e91d03e256 am 983f71da: am 6cab6005: Merge "Make detachViewFromParent more robust" into jb-mr1-dev 
* commit '983f71da9c3b8a8a4a34818e111ab311abb4cfb7':
  Make detachViewFromParent more robust
 2012-08-30 19:58:44 -07:00
Chet Haase
983f71da9c am 6cab6005: Merge "Make detachViewFromParent more robust" into jb-mr1-dev 
* commit '6cab6005a8746bdf86fd98a2a004f08d9473a445':
  Make detachViewFromParent more robust
 2012-08-30 19:56:36 -07:00
Chet Haase
6cab6005a8 Merge "Make detachViewFromParent more robust" into jb-mr1-dev 2012-08-30 19:54:32 -07:00
Adam Powell
8ab556f1c0 am c8f2fcb5: am b2fc49bc: Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev 
* commit 'c8f2fcb53505c68bda5af7d62774ba6adb62dfaa':
  Integrate new assets from UX that include layout bounds.
 2012-08-30 18:31:33 -07:00
Adam Powell
c8f2fcb535 am b2fc49bc: Merge "Integrate new assets from UX that include layout bounds." into jb-mr1-dev 
* commit 'b2fc49bceb13f8584e44c07a6416f1cbc7990006':
  Integrate new assets from UX that include layout bounds.
 2012-08-30 18:28:34 -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
24697465ba am c25494a4: am a559f882: am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit 'c25494a4a125c4cade58c85eacce9c58a7b250c8':
  Fix code problem in writePidDns
 2012-08-30 18:20:28 -07:00
Wink Saville
c25494a4a1 am a559f882: am 0e90f738: am f5311768: am 0dab1a19: Merge "Fix code problem in writePidDns" 
* commit 'a559f8826f1f1f35a33fc86e30b8b2bf9a2267ba':
  Fix code problem in writePidDns
 2012-08-30 18:18:35 -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
7ced19d5ce am b33ef6a2: am f203aeef: Enforce permissions for calls with specified userId 
* commit 'b33ef6a212c520d27fde88600c8f8c936b568446':
  Enforce permissions for calls with specified userId
 2012-08-30 17:31:43 -07:00