Fabrice Di Meglio
6acf744fab
am f4a1dad6: am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
...
* commit 'f4a1dad63db89b805df0c83b2044dad0d60e3686':
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
2012-10-10 17:34:52 -07:00
Fabrice Di Meglio
f4a1dad63d
am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
...
* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
2012-10-10 17:32:47 -07:00
Fabrice Di Meglio
5b04d0320b
am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
...
* commit 'b8021a88e5c00ebd985a348b56af29c95a178a90':
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
2012-10-10 17:29:52 -07:00
Fabrice Di Meglio
b8021a88e5
Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev
2012-10-10 17:26:41 -07:00
Jeff Sharkey
852ebc0cee
am 50035e83: am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
...
* commit '50035e83963a20e91a764054004fbda8f0a85807':
Move lockscreen to using haptic feedback setting.
2012-10-10 17:23:09 -07:00
Fabrice Di Meglio
2918ab6c32
Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
...
- rename to LayoutParams.resolveLayoutDirection(int)
- upate 17.txt too
Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
2012-10-10 16:47:51 -07:00
Jeff Sharkey
50035e8396
am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
...
* commit '89be4267d0a23ca258af607291bc4f905f963185':
Move lockscreen to using haptic feedback setting.
2012-10-10 16:32:36 -07:00
Jeff Sharkey
89be4267d0
am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
...
* commit '03bd101b887d9741230ac6a7d296d90436020b8c':
Move lockscreen to using haptic feedback setting.
2012-10-10 16:29:39 -07:00
Jeff Sharkey
5ed9d68040
Move lockscreen to using haptic feedback setting.
...
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.
Bug: 7318772
Change-Id: I637c392a1aaa22403cb20da4723f90c3b2e3de19
2012-10-10 16:08:47 -07:00
Dianne Hackborn
96a739737f
am 7beb70a9: am e5456645: am 840590dd: Merge "Fix issue #7311376 : Add API to allow apps to know if they are..." into jb-mr1-dev
...
* commit '7beb70a94af2ce29b4184fd7927bba93d90cf878':
Fix issue #7311376 : Add API to allow apps to know if they are...
2012-10-09 17:53:13 -07:00
Dianne Hackborn
7beb70a94a
am e5456645: am 840590dd: Merge "Fix issue #7311376 : Add API to allow apps to know if they are..." into jb-mr1-dev
...
* commit 'e54566457869a15d606870c230662b76c02456cb':
Fix issue #7311376 : Add API to allow apps to know if they are...
2012-10-09 17:51:13 -07:00
Dianne Hackborn
e545664578
am 840590dd: Merge "Fix issue #7311376 : Add API to allow apps to know if they are..." into jb-mr1-dev
...
* commit '840590dd642719f402491092944a12475d6d6a8e':
Fix issue #7311376 : Add API to allow apps to know if they are...
2012-10-09 17:49:11 -07:00
Dianne Hackborn
a8a9bd65bf
Fix issue #7311376 : Add API to allow apps to know if they are...
...
...running as the foreground user
Add UserManager.isUserRunning() which is the public version of the
existing method on ActivityManager.
Also add UserManager.isUserRunningOrStopping() since that seems like
it will be useful.
And fix the internal function that returns the array of currently
running users to not include stopped users.
Change-Id: I84672fa8748fc027fd402729586b5603f640e498
2012-10-09 17:00:31 -07:00
Craig Mautner
8565363126
am 337aa27a: am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
...
* commit '337aa27a6307e0f40705ee676551dda4bf6cb894':
Adds showWhenLocked attribute to Activities.
2012-10-07 11:55:58 -07:00
Craig Mautner
337aa27a63
am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
...
* commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2':
Adds showWhenLocked attribute to Activities.
2012-10-07 11:53:43 -07:00
Craig Mautner
8ee7ac22e6
am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
...
* commit '33877e15b8bfc50bd874027689a4794aa93b923d':
Adds showWhenLocked attribute to Activities.
2012-10-07 11:50:54 -07:00
Craig Mautner
33877e15b8
Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev
2012-10-07 11:48:50 -07:00
Dianne Hackborn
bbf0c3b592
am 71c66f0d: am 6d5d7fcb: am 52177738: Merge "Fix issue #7296314 , issue #7296314." into jb-mr1-dev
...
* commit '71c66f0ddaf3db93d0afa9d215a48e44cc23dc43':
Fix issue #7296314 , issue #7296314 .
2012-10-07 09:10:08 -07:00
Dianne Hackborn
71c66f0dda
am 6d5d7fcb: am 52177738: Merge "Fix issue #7296314 , issue #7296314." into jb-mr1-dev
...
* commit '6d5d7fcba944e772041f20022ac275a2ac057eb5':
Fix issue #7296314 , issue #7296314 .
2012-10-07 09:06:48 -07:00
Dianne Hackborn
6d5d7fcba9
am 52177738: Merge "Fix issue #7296314 , issue #7296314." into jb-mr1-dev
...
* commit '52177738e8fa38e2f7769db1bcad40e7405baf17':
Fix issue #7296314 , issue #7296314 .
2012-10-07 09:02:15 -07:00
Craig Mautner
5962b12bed
Adds showWhenLocked attribute to Activities.
...
The new attribute allows an Activity such as the alarm to appear
on all users screens.
Bug: 7213805 fixed.
Change-Id: If7866b13d88c04af07debc69e0e875d0adc6050a
2012-10-06 13:09:58 -07:00
Dianne Hackborn
4c1e3183ba
Fix issue #7296314 , issue #7296314 .
...
7296314 Crashing dreams are stuck
7296510 Transition from lock screen to dreaming is really bad
The window layer for dreams is now moved down below the keyguard,
so that some of the expected stuff like crash and ANR dialogs can
be seen on top of them. While doing this, I reorganized how we
define the layers so the constants are just in the switch statement,
so it is much less crazy-making trying to read how things go
together.
We now have some special cases for when a dream is being shown
to turn off its animation if the keyguard is currently shown.
Since we know it will be hiding the keyguard we need it to be
shown immediately so that you don't see whatever is behind it.
Cleaned up some handling of when the lock screen is displayed
while a FLAG_SHOW_WHEN_LOCKED window is displayed, so that the
lockscreen doesn't transiently get shown and mess up the fullscreen
or system UI state. This also fixes problems with any normal
activity that is doing this.
Hid the methods on DreamService for setting lights out mode. It
doesn't make sense to have such methods on DreamService, because
you can just as well do that on your own View that is showing the
dream content, and when you can do that you can fully participate
in the (required) interactions about it such as being told when
the mode goes away.
The DreamService method for going fullscreen now uses the window
flag for doing this, which is what you want, because you want this
state to persistent on that window and not get knocked out if
something above the window tickles the system UI state.
Also fixed the problem where dreams that hid the status bar would
have a jerky animation when going away, since they were causing the
activity behind them to be layed out without the lock screen. This
is a kind-of ugly special case in the window manager right now to
just not layout windows that are behind a dream. Good enough for MR1.
Change-Id: Ied2ab86ae068b1db0ff5973882f6d17b515edbcd
2012-10-05 20:38:31 -07:00
Tim Murray
f671fb0b35
Add copyFrom(Allocation a).
...
Change-Id: Ibc334326083b5471584dcf1c068e4e810aede20f
2012-10-05 16:45:45 -07:00
Tim Murray
bc254b9597
add resize2D to Java API
...
Change-Id: I91c0d2292486d63b93f8b07a9ec0137fe020ac21
2012-10-05 16:15:16 -07:00
Daniel Sandler
ac377c849a
am 3e78586d: am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev
...
* commit '3e78586db6ee28d5052fe9934104dec4c2e87f8b':
DreamService API revisions.
2012-10-04 21:03:20 -07:00
Daniel Sandler
3e78586db6
am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev
...
* commit '689a55d813a846d7b64f2bf1b6c86d9f9b5bdbea':
DreamService API revisions.
2012-10-04 21:01:13 -07:00
Daniel Sandler
689a55d813
am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev
...
* commit 'f5e2b2c26c37d839e6559319d311b62598c6dade':
DreamService API revisions.
2012-10-04 20:58:27 -07:00
Daniel Sandler
f5e2b2c26c
Merge "DreamService API revisions." into jb-mr1-dev
2012-10-04 20:56:08 -07:00
Daniel Sandler
2d78490292
DreamService API revisions.
...
Reduce reliance on Service interface overrides, instead
steering clients to the DreamService-specific lifecycle
hooks:
onAttachedToWindow .. onDreamingStarted ..
onDreamingStopped .. onDetachedFromWindow
The old Dream.java is finally gone now too.
Bug: 7281802
Change-Id: Ib7802c3397fde60ad1132fa49831da182eef4d7a
2012-10-04 23:38:15 -04:00
Dianne Hackborn
438e76f016
am 82e9bd11: am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206 : Need API to get/look up user serial number" into jb-mr1-dev
...
* commit '82e9bd113a812ea3507f53469ba7f161532b62ec':
Fix issue #7290206 : Need API to get/look up user serial number
2012-10-04 19:34:09 -07:00
Dianne Hackborn
82e9bd113a
am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206 : Need API to get/look up user serial number" into jb-mr1-dev
...
* commit 'a9e9eb7026331d4f0ba2fcebeca184df0463b9f2':
Fix issue #7290206 : Need API to get/look up user serial number
2012-10-04 18:21:47 -07:00
Dianne Hackborn
a9e9eb7026
am 0cdbd077: Merge "Fix issue #7290206 : Need API to get/look up user serial number" into jb-mr1-dev
...
* commit '0cdbd0776d141011567e63158aa0a430362425ef':
Fix issue #7290206 : Need API to get/look up user serial number
2012-10-04 18:20:41 -07:00
Dianne Hackborn
33f9cb8cf0
Fix issue #7290206 : Need API to get/look up user serial number
...
Change-Id: I1713215e7c205b1b66c36488f89e3fbf4572cb97
2012-10-04 17:15:10 -07:00
Dianne Hackborn
b1916a4bc1
am bba79225: am 8a22c07a: am 720d14db: Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
...
* commit 'bba79225c905ad72820f7c5405d5e9a1d47af83c':
Fix issue #7273573 : Need API to find out if activity is destroyed
2012-10-02 19:06:13 -07:00
Dianne Hackborn
bba79225c9
am 8a22c07a: am 720d14db: Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
...
* commit '8a22c07a8ce805a73269a6577f6dd00f213e71a5':
Fix issue #7273573 : Need API to find out if activity is destroyed
2012-10-02 19:04:15 -07:00
Dianne Hackborn
8a22c07a8c
am 720d14db: Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
...
* commit '720d14db87a5683ef2d4ad976fd8c28a5d2af611':
Fix issue #7273573 : Need API to find out if activity is destroyed
2012-10-02 19:01:32 -07:00
Dianne Hackborn
720d14db87
Merge "Fix issue #7273573 : Need API to find out if activity is destroyed" into jb-mr1-dev
2012-10-02 18:58:31 -07:00
Dianne Hackborn
6d9dcbccec
Fix issue #7273573 : Need API to find out if activity is destroyed
...
Also update 17.txt with all of the recent API additions.
Change-Id: I21fc669267935261a741c19e22b0bf35c3a76b81
2012-10-02 17:51:13 -07:00
Jeff Brown
a3164eaad4
am eaf36658: am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit 'eaf366586179554b624aff6e586f1a7b17b8dd4d':
Add new Display API for secure video capabilities.
2012-10-02 16:45:58 -07:00
Jeff Brown
eaf3665861
am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit '709b943475e3395b580451911557f894480e3133':
Add new Display API for secure video capabilities.
2012-10-02 16:44:02 -07:00
Jeff Brown
709b943475
am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev
...
* commit 'bcbe9cf475835102ae2490dc9f067a3ac78a9551':
Add new Display API for secure video capabilities.
2012-10-02 16:41:30 -07:00
Jeff Brown
77aebfdbae
Add new Display API for secure video capabilities.
...
Added a new API to determine whether the display supports
protected buffers so that an application can choose a different
content stream or change how it decodes the content so
that it will be viewable on the display.
At present, wifi display does not fully support protected
buffers although this may be enhanced in the future.
Bug: 6986623
Change-Id: If53a53d72b0ec92753cc4b29f99fcb131e00449b
2012-10-02 16:25:10 -07:00
Jeff Sharkey
18f6f9a085
am 3509e373: am f63ca02f: am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
...
* commit '3509e3731649a99b426b97363f06c7288e5d33e2':
Migrate more System and Secure settings to Global.
2012-10-02 14:05:44 -07:00
Jeff Sharkey
3509e37316
am f63ca02f: am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
...
* commit 'f63ca02f9fce6aedd7a03e9f8a95e2e2d6bf9eac':
Migrate more System and Secure settings to Global.
2012-10-02 14:04:22 -07:00
Jeff Sharkey
f63ca02f9f
am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev
...
* commit 'c12dd973724f5aab44814b31650b4b47314e952b':
Migrate more System and Secure settings to Global.
2012-10-02 14:00:24 -07:00
Jeff Sharkey
6e2bee75ce
Migrate more System and Secure settings to Global.
...
Includes telephony, WindowManager, PackageManager, and debugging
settings. Update API to point towards moved values.
Bug: 7231764, 7231252, 7231156
Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
2012-10-02 13:55:15 -07:00
Daniel Sandler
1672f22617
am 416e3487: am ba860e64: am b531c81c: Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev
...
* commit '416e3487652284136936395ef7932d6d356daca3':
Introduce ACTION_QUICK_CLOCK for the QS time tile.
2012-10-02 11:02:03 -07:00
Daniel Sandler
416e348765
am ba860e64: am b531c81c: Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev
...
* commit 'ba860e6419fb6119ca6a66f7da2d444ff6a19926':
Introduce ACTION_QUICK_CLOCK for the QS time tile.
2012-10-02 10:59:27 -07:00
Daniel Sandler
ba860e6419
am b531c81c: Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev
...
* commit 'b531c81cdb262bfb75d1637c12ef22f06fbd4968':
Introduce ACTION_QUICK_CLOCK for the QS time tile.
2012-10-02 10:58:08 -07:00
Daniel Sandler
b531c81cdb
Merge "Introduce ACTION_QUICK_CLOCK for the QS time tile." into jb-mr1-dev
2012-10-02 10:53:12 -07:00