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

85003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
7768e5e829 am 058ebd25: am 3b9a4160: Merge "Initial draft of high-level multi-display APIs." into jb-mr1-dev 
* commit '058ebd259ddc4e50eaae319126c0998f2702ddb0':
  Initial draft of high-level multi-display APIs.
 2012-08-31 15:53:43 -07:00
Jeff Brown
058ebd259d am 3b9a4160: Merge "Initial draft of high-level multi-display APIs." into jb-mr1-dev 
* commit '3b9a4160c99b2375b4874ccabf92eac68be06af6':
  Initial draft of high-level multi-display APIs.
 2012-08-31 15:50:32 -07:00
Jeff Brown
3b9a4160c9 Merge "Initial draft of high-level multi-display APIs." into jb-mr1-dev 2012-08-31 15:48:26 -07:00
Jeff Brown
a492c3a7b2 Initial draft of high-level multi-display APIs. 
This patch introduces the ability to create a Context that
is bound to a Display.  The context gets its configuration and
metrics from that display and is able to provide a WindowManager
that is bound to the display.

To make it easier to use, we also add a new kind of Dialog
called a Presentation.  Presentation takes care of setting
up the context as needed and watches for significant changes
in the display configuration.  If the display is removed,
then the presentation simply dismisses itself.

Change-Id: Idc54b4ec84b1ff91505cfb78910cf8cd09696d7d
 2012-08-31 15:42:45 -07:00
Christopher Tate
5af942d324 am fcfa228c: am 176d105d: Merge "Don\'t set the time zone under the caller\'s identity" into jb-mr1-dev 
* commit 'fcfa228c4c88581d3792934e645e1048f5913017':
  Don't set the time zone under the caller's identity
 2012-08-31 14:52:14 -07:00
Christopher Tate
fcfa228c4c am 176d105d: Merge "Don\'t set the time zone under the caller\'s identity" into jb-mr1-dev 
* commit '176d105d2f71198966b566d36d4e856a797695c7':
  Don't set the time zone under the caller's identity
 2012-08-31 14:49:43 -07:00
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
06ce03f57e am 6d044921: am 58a2950b: 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 - 
* commit '6d0449214aef65d60de81c8dcdf65974245f6b18':
  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
 2012-08-31 14:02:36 -07:00
Jim Miller
6d0449214a am 58a2950b: 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 animatio 
* commit '58a2950b66f049c0d9e9f1a9fce16884f0b50e19':
  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
 2012-08-31 14:00:09 -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
c89a553739 am b5ad2fc3: am 8c890f8a: Merge "Work around instability of Display.getRotation()." into jb-mr1-dev 
* commit 'b5ad2fc376bec612e21a702ecae6d86ab0eca5fb':
  Work around instability of Display.getRotation().
 2012-08-31 12:13:50 -07:00
Daniel Sandler
b5ad2fc376 am 8c890f8a: Merge "Work around instability of Display.getRotation()." into jb-mr1-dev 
* commit '8c890f8a69ea1e6f8f7fe989a610ffe738e91866':
  Work around instability of Display.getRotation().
 2012-08-31 12:09:15 -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
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
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