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

12825 Commits

Author SHA1 Message Date
Jeff Sharkey
670cf5c663 am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '22c3f90639fa8d74de68a63b0a13412740580845':
  Move ringtone redirection to MediaPlayer.
 2014-11-14 00:02:58 +00:00
Andreas Gampe
c25e0dcea9 am 5b50cd13: Merge "Frameworks/base: Fix build" 
* commit '5b50cd13688e0a71991b5335d3a28189e1906a2c':
  Frameworks/base: Fix build
 2014-11-13 23:55:38 +00:00
Jeff Sharkey
22c3f90639 am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 
* commit '628d2606f757da7b6734c7cd438535069f77b065':
  Move ringtone redirection to MediaPlayer.
 2014-11-13 23:50:16 +00:00
Andreas Gampe
577f48c1c9 Frameworks/base: Fix build 
Fix a typo.

Change-Id: Ida417c842563576b053d9f5553a2aa8d5862897c
 2014-11-13 15:44:27 -08:00
Andreas Gampe
d99c25eff3 am 37079e29: Merge "Frameworks/base: Wall Werror in packages" 
* commit '37079e29171df20b6355244882dce9d745da55db':
  Frameworks/base: Wall Werror in packages
 2014-11-13 23:39:49 +00:00
Andreas Gampe
423ba098bd Frameworks/base: Wall Werror in packages 
Turn on -Wall -Werror in packages/. Fix warnings.

Change-Id: I4ec7256a7df46017e1895575719f2b5aca978bd0
 2014-11-13 15:25:34 -08:00
Jeff Sharkey
628d2606f7 Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 2014-11-13 22:16:15 +00:00
Jeff Sharkey
3b566b8470 Move ringtone redirection to MediaPlayer. 
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.

With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.

To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.

Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
 2014-11-13 13:52:41 -08:00
John Spurlock
eba075e5db am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev 
automerge: 1a68ba6

* commit '1a68ba6b85473565de174f72beeb7734e49e0fa0':
  Zen: Update condition text for current condition.
 2014-11-13 20:39:04 +00:00
John Spurlock
1a68ba6b85 am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev 
* commit '338bc5a41854d40dfb35ec2865024d3b2737a864':
  Zen: Update condition text for current condition.
 2014-11-13 20:26:11 +00:00
John Spurlock
338bc5a418 Merge "Zen: Update condition text for current condition." into lmp-mr1-dev 2014-11-13 20:20:25 +00:00
Jorim Jaggi
922807a39c am c1bb8620: am a77a37c4: Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev 
* commit 'c1bb86200dd995229ec6a3956f21065a8e4a425f':
  Fix doze jank by removing a fullscreen layer of overdraw
 2014-11-13 17:08:51 +00:00
Jorim Jaggi
c1bb86200d am a77a37c4: Merge "Fix doze jank by removing a fullscreen layer of overdraw" into lmp-mr1-dev 
* commit 'a77a37c48a00744d6a753172516a2c7f5f2a9004':
  Fix doze jank by removing a fullscreen layer of overdraw
 2014-11-13 17:05:12 +00:00
Jorim Jaggi
5fbd9950e7 am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 
* commit '76c234c8dfca8203521b022c15a38e041c294589':
  Fix wrong states when waking up from doze via touch
 2014-11-13 16:55:13 +00:00
Jorim Jaggi
048af1f727 Fix doze jank by removing a fullscreen layer of overdraw 
Move all doze related stuff into DozeScrimController, and combine
both alpha values from the regular ScrimController and
DozeScrimController before applying it to a view. Move the black
background from NotificationPanelView to DozeScrimController, which
saves a fullscreen layer of overdraw during the transition.

Bug: 18238168
Change-Id: Ifb133bf4a0f8255f5c2f5e205509af339cac8c8f
 2014-11-13 17:54:21 +01:00
Jorim Jaggi
76c234c8df am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev 
* commit 'd0d23c80dae34a126c8024748554a5d07bf3291c':
  Fix wrong states when waking up from doze via touch
 2014-11-13 16:50:53 +00:00
Jorim Jaggi
68b83a784a Fix wrong states when waking up from doze via touch 
Bug: 18337222
Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
 2014-11-13 17:09:29 +01:00
John Spurlock
25c3421c5e Zen: Update condition text for current condition. 
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.

Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).

Also, clear the fired-alarm cache on time or time-zone resets.

Bug: 16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
 2014-11-13 11:03:10 -05:00
Geoff Mendal
2ebf761ebe Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-13 09:51:10 +00:00
Geoff Mendal
f030e66f9d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-13 09:43:51 +00:00
Geoff Mendal
9976cdbfa3 Import translations. DO NOT MERGE 
Change-Id: I2427bb3c070b9d0d69a2488970a3e74260800190
Auto-generated-cl: translation import
 2014-11-12 23:24:32 -08:00
Geoff Mendal
0df377c7a6 Import translations. DO NOT MERGE 
Change-Id: Ib3433ab22465ba880832eb10196bbab2472a7884
Auto-generated-cl: translation import
 2014-11-12 23:20:52 -08:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp 
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
 2014-11-12 13:24:42 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++. 
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
 2014-11-12 11:22:20 -08:00
Geoff Mendal
b3f447e9ca Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-12 17:07:48 +00:00
Geoff Mendal
cfefab71b1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-12 17:07:10 +00:00
Geoff Mendal
c2651d82e8 Import translations. DO NOT MERGE 
Change-Id: Iaba356a3700ef7b49150ea1331273c1b6e9ca5b9
Auto-generated-cl: translation import
 2014-11-12 08:59:14 -08:00
Geoff Mendal
3830c60b9c Import translations. DO NOT MERGE 
Change-Id: I629a49e626a3121f8df33574952162672c943341
Auto-generated-cl: translation import
 2014-11-12 08:55:50 -08:00
Selim Cinek
465d1eb746 am 1419db40: am 89444a38: Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev 
* commit '1419db40f75be642f9d503e51ecc2b205f792bcd':
  Solved notification overlay issue once and for all
 2014-11-12 16:33:24 +00:00
Selim Cinek
7dc856035c am 087c96f8: am 04675730: Merge "Improved the dismiss all animation" into lmp-mr1-dev 
* commit '087c96f8c9ae18831707b0c93f37d0d3438e88e1':
  Improved the dismiss all animation
 2014-11-12 16:33:17 +00:00
Selim Cinek
1419db40f7 am 89444a38: Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev 
* commit '89444a380d85f8961a4a900734590571375b4f3f':
  Solved notification overlay issue once and for all
 2014-11-12 16:29:24 +00:00
Selim Cinek
087c96f8c9 am 04675730: Merge "Improved the dismiss all animation" into lmp-mr1-dev 
* commit '046757300c0a9b2043ff71e49bc3be50d5279443':
  Improved the dismiss all animation
 2014-11-12 16:29:19 +00:00
Selim Cinek
89444a380d Merge "Solved notification overlay issue once and for all" into lmp-mr1-dev 2014-11-12 16:27:28 +00:00
Selim Cinek
046757300c Merge "Improved the dismiss all animation" into lmp-mr1-dev 2014-11-12 16:26:22 +00:00
Selim Cinek
c19956bf84 am a89c8fe7: am 9852ecd6: Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev 
* commit 'a89c8fe7ee9b1a53f97ffc94d14a99d108e08062':
  Fixed a bug where the clearable flag was set inconsistently
 2014-11-12 16:20:26 +00:00
Selim Cinek
858fb04f32 am 5b560f57: am 29685c2f: Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev 
* commit '5b560f57a93edeb4f8123a1cd53d68b3e3694705':
  Added dissapear animation to pattern and pin input
 2014-11-12 16:20:20 +00:00
Selim Cinek
a89c8fe7ee am 9852ecd6: Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev 
* commit '9852ecd6378be67c36010b415cffbc852e6a265f':
  Fixed a bug where the clearable flag was set inconsistently
 2014-11-12 16:16:14 +00:00
Selim Cinek
5b560f57a9 am 29685c2f: Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev 
* commit '29685c2fde7b3c3cc57994e61915321902b16246':
  Added dissapear animation to pattern and pin input
 2014-11-12 16:16:09 +00:00
Selim Cinek
9852ecd637 Merge "Fixed a bug where the clearable flag was set inconsistently" into lmp-mr1-dev 2014-11-12 16:13:07 +00:00
Selim Cinek
29685c2fde Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev 2014-11-12 16:12:13 +00:00
Selim Cinek
f336f4c13a Solved notification overlay issue once and for all 
But...
Once and for all!

Bug: 18314177
Change-Id: I484bea7d9f183d749fcdfba899d40292245f353d
 2014-11-12 17:02:04 +01:00
Jorim Jaggi
0f51dd679c am bd70ed1d: am a816a075: Merge "Improve lockscreen launch animations" into lmp-mr1-dev 
* commit 'bd70ed1de2dda959b15be4f6eb2179c3235b3179':
  Improve lockscreen launch animations
 2014-11-12 15:55:56 +00:00
Jorim Jaggi
46f38ac35d am 4c3133a2: am cb326240: Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev 
* commit '4c3133a2d1142ca5bf5d6165d32621cc22b34392':
  Correctly handle launch animations for affordances
 2014-11-12 15:55:50 +00:00
Jorim Jaggi
2240f80634 am d04f864c: am b9eedce2: Merge "Fix lockscreen launch animations once and for all" into lmp-mr1-dev 
* commit 'd04f864cae1ae553398774692effb663b73f902c':
  Fix lockscreen launch animations once and for all
 2014-11-12 15:55:44 +00:00
Jorim Jaggi
bd70ed1de2 am a816a075: Merge "Improve lockscreen launch animations" into lmp-mr1-dev 
* commit 'a816a075066b7f90635d81918a7af9bc7a76e47f':
  Improve lockscreen launch animations
 2014-11-12 15:51:56 +00:00
Jorim Jaggi
4c3133a2d1 am cb326240: Merge "Correctly handle launch animations for affordances" into lmp-mr1-dev 
* commit 'cb3262403420417f355aacde93e0e43493e510f6':
  Correctly handle launch animations for affordances
 2014-11-12 15:51:51 +00:00
Jorim Jaggi
d04f864cae am b9eedce2: Merge "Fix lockscreen launch animations once and for all" into lmp-mr1-dev 
* commit 'b9eedce21a460ad26175391e6c9c9e3ca369bafb':
  Fix lockscreen launch animations once and for all
 2014-11-12 15:51:46 +00:00
Jorim Jaggi
f8d77da969 Improve lockscreen launch animations 
- Add a timeout so if WindowManager "forgets" to tell that the
activity has drawn, we still unlock after 3 seconds, so the user
is not completely stuck.

- Use the screen height instead of the window height for the
translation animation.

- Don't run the animation if the attached window is not null. The
animation from the attached window will influence the transformation
as well, so there is no need to run an additional animation in this
case (apps with SurfaceView's had broken unlock transitions because
of this).

- If the starting window needs to go away while the unlock transition
is running, modify the existing animation such that it fades out in
the same transition.

Bug: 15991916
Change-Id: Ia5dfa31e1bc0d5745fe228e1daf08e268733b6f1
 2014-11-12 15:02:33 +01:00
Jorim Jaggi
d6f440e0ff Correctly handle launch animations for affordances 
Bug: 15991916
Change-Id: I019d28b960bc74f3c0f05081bea4a303b16df204
 2014-11-12 15:02:19 +01:00
Jorim Jaggi
44f60cca7b Fix lockscreen launch animations once and for all 
In SysUI, make sure not to dismiss Keyguard multiple times when just
waiting for a deferred dismissal, so WindowManager doesn't get
multiple calls to keyguardGoingAway.

Change heuristics how notifying Keyguard about activity drawn works.
Always notify Keyguard after executing an app transition, and notify
it also when not doing a transition after a startActivity call.

For that to work, update AppWindowToken.startingDisplayed also when
the window is displayed, but force hidden because of Keyguard.

Further, handle the case correctly when a window gets added during
the Keyguard exit animation by overriding the start time for the
animation of that new window. Also don't apply a transition animation
for a window when executing keyguard exit animation, so by removing
a starting window we don't break this animation.

Last but not least, tell Keyguard to start exiting immediately if
animations for exiting are disabled, like when going to phone/camera
on lockscreen. Before, we always had a delay of 1 second because we
waited for the timeout.

Bug: 1599196
Bug: 18272544
Change-Id: I596b2489f814b934abd256e16079d3d3f326e209
 2014-11-12 15:02:05 +01:00