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

2694 Commits

Author SHA1 Message Date
Adam Powell
5f97930fc5 am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit 'c41fa708271e204a7983aba291389ea1554227b2':
  onWindowDismissed API cleanup
 2014-05-06 20:24:23 +00:00
Adam Powell
c41fa70827 am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev 
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
  onWindowDismissed API cleanup
 2014-05-06 20:20:40 +00:00
Adam Powell
117b695222 onWindowDismissed API cleanup 
Move the window swipe to dismiss plumbing off of Window.Callback into
its own internal interface implemented by Activity and Dialog. Make it
internal API instead of public. Apps should control this via the
window feature setting.

Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a
 2014-05-05 18:20:47 -07:00
Justin Koh
f46009225b am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev 
* commit '9abf0b9031d0ddc33970589d2fb88065d15de712':
  Make global action key timeout configurable.
 2014-05-02 17:33:48 +00:00
Justin Koh
9abf0b9031 am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev 
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
  Make global action key timeout configurable.
 2014-05-02 17:28:53 +00:00
Justin Koh
feabd2c730 Make global action key timeout configurable. 
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321

Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
 2014-05-02 10:04:34 -07:00
Jeff Brown
fb0448ab4b resolved conflicts for merge of 4f8cd188 to master 
Change-Id: I148cd616cd14d834915978aa2dc3f9e27188dbd3
 2014-05-01 18:19:31 -07:00
Jeff Brown
4f8cd18880 am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev 
* commit '7f6ab17d414726868563105cd995b37dd519320b':
  Clean up some terminology related to interactive state.
 2014-05-01 23:29:13 +00:00
Jeff Brown
7f6ab17d41 Merge "Clean up some terminology related to interactive state." into klp-modular-dev 2014-05-01 23:25:11 +00:00
Vinod Krishnan
2c3e7a3486 am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev 
* commit '8e95d9883666e2b4b1ce26b312d09ba42ae37f7a':
  DialogAlert window changes for Micro
 2014-05-01 22:49:29 +00:00
Vinod Krishnan
8e95d98836 am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev 
* commit '5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253':
  DialogAlert window changes for Micro
 2014-05-01 22:46:16 +00:00
Vinod Krishnan
5c10c3cfa6 Merge "DialogAlert window changes for Micro" into klp-modular-dev 2014-05-01 22:43:58 +00:00
Jeff Brown
140ffc783c Clean up some terminology related to interactive state. 
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
 2014-05-01 15:22:27 -07:00
Mark Renouf
61bc9f37cc am 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev 
* commit '5b72a6abf85b26e66589db478cc105e7bfec6116':
  SwipeDismiss: limit fade to 50% alpha while swiping
 2014-05-01 17:36:04 +00:00
Mark Renouf
5b72a6abf8 am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev 
* commit '41615284dfb00595ed642c4e31da6a035ff53224':
  SwipeDismiss: limit fade to 50% alpha while swiping
 2014-05-01 17:32:10 +00:00
Mark Renouf
d076121630 SwipeDismiss: limit fade to 50% alpha while swiping 
BUG: 14319825

Change-Id: I3704fab77f2d3660ae374bdf16c767c124dcb8e9
 2014-05-01 01:21:19 +00:00
Vinod Krishnan
fa8fc41bdc DialogAlert window changes for Micro 
Bug: 13243004

- The only difference between alert_dialog_micro.xml and alert_dialog_holo.xml is:
<     android:layout_height="match_parent"
---
>     android:layout_height="wrap_content"
>     android:layout_marginStart="8dip"
>     android:layout_marginEnd="8dip"

Change-Id: I84f9a88099a37aa7f5868e128b19cb1e812cb745
 2014-04-28 22:07:26 -07:00
Michael Wright
337d9d2edc Move key attribute information into KeyEvent. 
This consolidates all of the information that was in the native
KeyEvent and the KeyLayout files into the managed KeyEvent class.

It also moves the definition for all of the key names to the native
side, rather than having them in both places.

Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
 2014-04-28 14:33:40 -07:00
Justin Koh
be4c2c2b99 resolved conflicts for merge of d90712d0 to master 
Change-Id: Ia587476c001bce5f0969557b15d366aed6b322b1
 2014-04-22 11:05:15 -07:00
Justin Koh
d90712d044 am 3b9a3cc0: Update GlobalActions for watches. 
* commit '3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e':
  Update GlobalActions for watches.
 2014-04-22 17:06:56 +00:00
Justin Koh
3b9a3cc02e Update GlobalActions for watches. 
Update GlobalActions for watches: only have power off and settings, due to
limited real estate.

Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e
 2014-04-22 10:01:47 -07:00
Mindy Pereira
cbc7168e55 am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev 
* commit '03f7f44250faea2db0147f43b6699436e540889d':
  Update window alpha at the same time as translating
 2014-04-17 23:33:33 +00:00
Mindy Pereira
03f7f44250 am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev 
* commit 'cb54f978b565459210e80054e95becd1f8cae173':
  Update window alpha at the same time as translating
 2014-04-17 22:57:23 +00:00
Mindy Pereira
b0ea484615 Update window alpha at the same time as translating 
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept

Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
 2014-04-17 14:53:24 -07:00
George Mount
31a217290c Split Activity Transitions out of PhoneWindow. 
Bug 13622834
Made it possible to use shared elements without making
Views invisible.

Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
 2014-04-17 09:49:25 -07:00
Jeff Brown
861aa0073a am 26c6a50f: Rename isScreenOn() to isInteractive(). 
* commit '26c6a50f037c6af9c41b3f96269fe194748605ce':
  Rename isScreenOn() to isInteractive().
 2014-04-11 09:24:24 +00:00
Jeff Brown
26c6a50f03 Rename isScreenOn() to isInteractive(). 
Fix build break due to an earlier merge.

Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
 2014-04-11 02:15:54 -07:00
Jeff Brown
858737d08d resolved conflicts for merge of 4e5c089e to master-lockscreen-dev 
Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
 2014-04-11 01:47:08 -07:00
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master 
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
 2014-04-11 01:33:20 -07:00
Jeff Brown
337e764deb am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev 
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.
 2014-04-11 03:49:37 +00:00
Jeff Brown
037c33eae7 Plumb display power state through display manager. 
Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
 2014-04-10 20:46:14 -07:00
Adrian Roos
3850211afb Protect WindowManager's PRIVATE_FLAG_KEYGUARD 
Enforce that only status bar can use the new keyguard flag.

Bug: 13635952
Change-Id: I807ffbb1e431fa187f22d030331374eb61dedcf3
 2014-04-09 21:07:04 +02:00
Jorim Jaggi
5de6bf4210 Make FLAG_SHOW_ON_LOCKSCREEN work again. 
Bug: 13635952
Change-Id: I50c5184c41e10e90e6547d810b2be9eed103e074
 2014-04-09 18:58:21 +02:00
Jorim Jaggi
afd4a5531a Force status bar showing when Keyguard is showing. 
Bug: 13635952
Change-Id: I5015f17010c853f70f5622b774b2c5b4e1d8332f
 2014-04-08 19:04:42 +02:00
George Mount
c3bf3bb913 am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions." 
* commit '6fd0ef7f7367ce6e2272e9c517793d502fe7f8da':
  Add Transitions useful for Activity transitions.
 2014-04-07 16:22:49 +00:00
George Mount
f4360efb52 am dde10d07: Merge "Implement "Back" for Activity Transitions." 
* commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c':
  Implement "Back" for Activity Transitions.
 2014-04-07 16:22:46 +00:00
George Mount
d6107a3170 Add Transitions useful for Activity transitions. 
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders

Moved capability from Fade to Visibility.

Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
 2014-04-07 09:14:09 -07:00
George Mount
cb4b7d999e Implement "Back" for Activity Transitions. 
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
 2014-04-07 09:00:13 -07:00
Alan Viverette
506a1eb436 am 43c290f0: Tint more icons, fix dialog styles and headers 
* commit '43c290f05cae0a600243d2e1ad52a07e4ca5e003':
  Tint more icons, fix dialog styles and headers
 2014-04-04 18:26:37 +00:00
Alan Viverette
43c290f05c Tint more icons, fix dialog styles and headers 
BUG: 13795227
Change-Id: I4cf217748196512a5245468684246299205319f2
 2014-04-04 11:20:06 -07:00
Jorim Jaggi
ae6ffcc3c7 Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev 2014-04-02 21:22:59 +00:00
Jorim Jaggi
cff0acb6b1 Wait for Keyguard to be drawn after boot. 
The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
 2014-04-02 22:11:19 +02:00
Craig Mautner
b67c41d281 am 74ee938d: resolved conflicts for merge of ffb22827 to master 
* commit '74ee938dcc5e1ab0309dd87278e26f604c756b26':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 22:27:00 +00:00
Craig Mautner
74ee938dcc resolved conflicts for merge of ffb22827 to master 
Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
 2014-04-01 15:20:16 -07:00
Craig Mautner
ffb22827d7 am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:56:55 +00:00
Craig Mautner
2b6fe2990d am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:48:04 +00:00
Michael Kolb
dd54a9f867 am 4bb047fa: Fix build after bad merge resolution 
* commit '4bb047fa5e6d43a027bfe1dfe23b3541e3910a31':
  Fix build after bad merge resolution
 2014-04-01 21:47:55 +00:00
Michael Kolb
4bb047fa5e Fix build after bad merge resolution 
Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
 2014-04-01 14:38:57 -07:00
Michael Kolb
2ece6e434a am 7fbde1e8: resolved conflict for merge of 2c73e08d to master 
* commit '7fbde1e83703f800c98c1ef7c543f3146cfa43ef':
  Add outset to decor view measuring
 2014-04-01 21:13:31 +00:00
Michael Kolb
7fbde1e837 resolved conflict for merge of 2c73e08d to master 
Change-Id: Iee2e1f773469db0ba26b153193945a6c246af151
 2014-04-01 14:06:11 -07:00