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

87115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev 
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
 2012-10-09 00:05:26 -07:00
Jeff Brown
8f4baad387 Merge "Blank or unblank all displays as need." into jb-mr1-dev 2012-10-09 00:02:46 -07:00
Adam Powell
6cccadfb43 am 434f8172: Merge "Don\'t do a wifi p2p scan in MediaRouter if we\'re already connected" into jb-mr1-dev 
* commit '434f8172332f0abf02499f33846c6042ed628b0c':
  Don't do a wifi p2p scan in MediaRouter if we're already connected
 2012-10-08 21:23:28 -07:00
Adam Powell
434f817233 Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev 2012-10-08 21:20:20 -07:00
Adam Powell
b072a9686c Don't do a wifi p2p scan in MediaRouter if we're already connected 
When we're connected to a wifi display already, some configurations
might hiccup or otherwise disrupt the media stream if we initiate a
new scan. Block the MediaRouter's default scanning behavior if we
start up while already connected to a wifi display. (A scan will still
occur if the user opens the picker dialog.)

Change-Id: I413efa883eec41fe0377da18bcb55bc72e2ac729
 2012-10-08 20:56:35 -07:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need. 
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
 2012-10-08 19:23:15 -07:00
Brian Colonna
66a65f9c4b am eb7f1571: Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 
* commit 'eb7f1571ae60db17ead3a8879b4b49df306f009d':
  FUL fallback is no longer account login  - fix b/7280196
 2012-10-08 17:42:02 -07:00
Brian Colonna
eb7f1571ae Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 2012-10-08 17:39:16 -07:00
Jim Miller
d1c0e98076 am 0c9b5359: Merge "Fix "checking account" string" into jb-mr1-dev 
* commit '0c9b5359bd15f74857f6b07931f484aca214abcf':
  Fix "checking account" string
 2012-10-08 17:29:23 -07:00
Jim Miller
0c9b5359bd Merge "Fix "checking account" string" into jb-mr1-dev 2012-10-08 17:26:22 -07:00
Jeff Brown
541d8d2c2b am 2aac1a0f: Merge "Improve the power off fade animation." into jb-mr1-dev 
* commit '2aac1a0fe8fe5dea1185374ed914f95101de16ed':
  Improve the power off fade animation.
 2012-10-08 17:02:30 -07:00
Jeff Brown
2aac1a0fe8 Merge "Improve the power off fade animation." into jb-mr1-dev 2012-10-08 17:00:18 -07:00
Jim Miller
6c5bd361fe Fix "checking account" string 
Fixes bug 7309934

Change-Id: Ia665142b8dcd8de424312bd7bf0800d7b871b03b
 2012-10-08 16:38:50 -07:00
Jeff Brown
252c206984 Improve the power off fade animation. 
Fixes an issue where the dim surface alpha was not actually being
animated like it was supposed to.

Bug: 7224614
Change-Id: Iffd54367ca97ae7fd4b9603807f4e036750442b2
 2012-10-08 16:21:01 -07:00
Baligh Uddin
62766897cb am e70bf654: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e70bf65423056c2f336602aa9b3942ea446225e4':
  Import translations. DO NOT MERGE
 2012-10-08 15:56:02 -07:00
Baligh Uddin
e70bf65423 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 15:53:43 -07:00
Svetoslav Ganov
bfe01498a9 am 62f1722d: Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev 
* commit '62f1722d7c168048952f93045c5f1d06fdab0202':
  Accessibility enhancements within quick settings and notification shade.
 2012-10-08 15:53:17 -07:00
Svetoslav Ganov
62f1722d7c Merge "Accessibility enhancements within quick settings and notification shade." into jb-mr1-dev 2012-10-08 15:51:15 -07:00
Baligh Uddin
388f157be8 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-08 15:49:58 -07:00
Baligh Uddin
3c576d9b65 Import translations. DO NOT MERGE 
Change-Id: Idd93f9399dcd2466e3d6d84bee4b536a8a41b476
Auto-generated-cl: translation import
 2012-10-08 15:23:58 -07:00
Baligh Uddin
404615d266 Import translations. DO NOT MERGE 
Change-Id: I9059498aed3bca6294e9f93d89709454c04e0997
Auto-generated-cl: translation import
 2012-10-08 15:22:19 -07:00
Victoria Lease
c1bb4bfb28 am 0fb7e32a: Merge "Last position improvements for GeofenceManager" into jb-mr1-dev 
* commit '0fb7e32a0129e9e62d58ea652cc00f8a908d65b5':
  Last position improvements for GeofenceManager
 2012-10-08 15:17:37 -07:00
Victoria Lease
0fb7e32a01 Merge "Last position improvements for GeofenceManager" into jb-mr1-dev 2012-10-08 15:14:49 -07:00
Svetoslav Ganov
b2e330c6c4 am 55c70293: Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev 
* commit '55c7029312f67a80c658fa84bd404ef7569d02d8':
  Show the touch explore enable dialog for the current user.
 2012-10-08 15:05:08 -07:00
Dianne Hackborn
1b94df8af9 am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 
* commit '4efbab480d7e1b770c5515a76b897359730c1a4d':
  Framework side of issue #7302511: GCM client needs to use new framework API...
 2012-10-08 15:05:04 -07:00
Svetoslav Ganov
55c7029312 Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Dianne Hackborn
4efbab480d Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Baligh Uddin
ed02652e83 am bd03f5ab: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bd03f5abb7bbd5552d49dfec4e78f3d9454238af':
  Import translations. DO NOT MERGE
 2012-10-08 15:01:53 -07:00
Baligh Uddin
bd03f5abb7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 14:59:37 -07:00
Baligh Uddin
a52132ab47 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-08 14:57:37 -07:00
Baligh Uddin
46c2699824 Import translations. DO NOT MERGE 
Change-Id: I8dd8dacad06a9f7be27ac666f7fc4a51308347aa
Auto-generated-cl: translation import
 2012-10-08 14:47:48 -07:00
Baligh Uddin
c87254db6b Import translations. DO NOT MERGE 
Change-Id: Ifb43315957971f47b28da90481c5e123aa441fc8
Auto-generated-cl: translation import
 2012-10-08 14:45:19 -07:00
Dianne Hackborn
36d337adff Framework side of issue #7302511: GCM client needs to use new framework API... 
...to fix background->shutdown delivery race

Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.

Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.

Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
 2012-10-08 14:33:47 -07:00
Jim Miller
6b9cd4d256 am 8215ddb4: Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev 
* commit '8215ddb4f5fd6d7b6444baa2416190799e3aa09e':
  Properly handle cancel event in GlowPadView
 2012-10-08 13:42:02 -07:00
Jim Miller
8215ddb4f5 Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev 2012-10-08 13:40:15 -07:00
Svetoslav Ganov
318b00bfee Show the touch explore enable dialog for the current user. 
1. We are showing a warning dialog if the user enables an accessibility
   service that requests explore by touch. This dialog was shown only
   for the owner but should be shown for the current user.

bug:7304437

Change-Id: I692b5112df16405e6d2e4890aafbfde79981f973
 2012-10-08 13:18:12 -07:00
Justin Mattson
a009ee2261 Merge "Reverse movement direction of DPAD events" into jb-mr1-aah-dev 2012-10-08 12:52:36 -07:00
Raph Levien
6594eca0a9 am 9704b563: Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev 
* commit '9704b563d63d8b5fe8e568dfb7190f8440b56698':
  Fix for 7301594 Html.toHtml creating potentially invalid html
 2012-10-08 12:43:12 -07:00
Casey Burkhardt
bac221ff0b Accessibility enhancements within quick settings and notification shade. 
Change-Id: I377c389abe3ce2285a620e60f4c8de4727f4f5c9
Bug: 7229886
 2012-10-08 12:41:32 -07:00
Raph Levien
9704b563d6 Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev 2012-10-08 12:40:17 -07:00
Craig Mautner
9641fc3091 am 847b1229: Merge "Fix problems with IME layers." into jb-mr1-dev 
* commit '847b12295e0a5c9e04f344f04c3540751ef6b9d1':
  Fix problems with IME layers.
 2012-10-08 12:30:54 -07:00
Craig Mautner
847b12295e Merge "Fix problems with IME layers." into jb-mr1-dev 2012-10-08 12:28:23 -07:00
Justin Mattson
86cf0cdfe1 Reverse movement direction of DPAD events 
The first way I had it produces somewhat unexpected behavior. If you
scroll past the top of the list, focus moves down to the control
below.

This changes it so scrolling past the bottom of the list moves focus
to the next control below.

Change-Id: I886e1854df85ceb203dac61c7f8c7daf6749e90e
 2012-10-08 11:59:38 -07:00
Justin Koh
1a7cfd67c2 Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev 2012-10-08 10:52:07 -07:00
Craig Mautner
e6f7d5054a Fix problems with IME layers. 
The query WindowState.isDisplayed did not take into account being
displayed due to app animations.

When an existing input method target was animating away the logic
for detecting if it was still on screen was faulty. This led to
assigning the input method to a layer below its target and obscuring
the input method until the animation was complete.

Bug: 7296703 fixed.
Change-Id: Ib00db4f21b726ed57d25d6a1e796b65a7d45ee97
 2012-10-08 10:34:17 -07:00
Brian Colonna
9ded0e1d48 FUL fallback is no longer account login - fix b/7280196 
When Face Unlock failed the maximum number of times (3), it was asking
for account login when it should have been asking for the backup lock
that the user chose when setting up Face Unlock.

This change splits the isBiometricUnlockEnabled() function into two.
One of them strictly checks whether it exists and is selected.  The
other one checks whether too many attempts have occurred.  When
deciding which backup to choose, the decision is now based only on
whether Face Unlock is enabled.  Checking whether too many attempts
had occurred caused the bug because the check indicated it had already
'fallen back' to pattern, and the backup for pattern was being
selected instead of the backup for biometric unlock.

Change-Id: I6b9cf2c5155e8c14933cbfc8f5d58ebc007e53cb
 2012-10-08 13:02:41 -04:00
Chris Craik
7952c4cd99 am bb5f014a: Merge "Use offset in line drawing" into jb-mr1-dev 
* commit 'bb5f014ae805f166328d72cbf826e8f1f17c9daf':
  Use offset in line drawing
 2012-10-08 09:48:31 -07:00
Chris Craik
bb5f014ae8 Merge "Use offset in line drawing" into jb-mr1-dev 2012-10-08 09:46:05 -07:00
Baligh Uddin
3257a78918 am 0e2aade9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0e2aade9f1cfbbbdb60889ca9e1399093eb542ac':
  Import translations. DO NOT MERGE
 2012-10-08 08:31:46 -07:00
Baligh Uddin
0e2aade9f1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 08:29:02 -07:00