Daniel Sandler
da4ab9114a
am b7b6f820: am a6aef1bb: Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev
...
* commit 'b7b6f8200dca3e65fe84cf41342197fb29acecb6':
New status bar capable of multiple sliding panels.
2012-08-14 08:01:00 -07:00
Steve Block
9ccdb0461c
am 3d935621: am 27f3e32e: Clarify JavaDoc for WebView.loadData()
...
* commit '3d93562115237d8a893f3e686e44116ba506d57a':
Clarify JavaDoc for WebView.loadData()
2012-08-14 07:59:11 -07:00
Daniel Sandler
a6aef1bbb4
Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev
2012-08-14 07:56:44 -07:00
Steve Block
27f3e32ee1
Clarify JavaDoc for WebView.loadData()
...
Bug: 5461416
Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710
2012-08-14 15:54:35 +01:00
Matthew Xie
6e8f4d7820
am 3fe98084: am 58de1427: Merge "Implement enableNoAutoconnect()" into jb-mr1-dev
...
* commit '3fe98084e661f29c769664463f602a90a72c35c8':
Implement enableNoAutoconnect()
2012-08-14 00:42:09 -07:00
Matthew Xie
58de1427c3
Merge "Implement enableNoAutoconnect()" into jb-mr1-dev
2012-08-14 00:37:01 -07:00
Ganesh Ganapathi Batta
fffa86ba83
Implement enableNoAutoconnect()
...
Adding enableNoAutoconnect() API support in Bluetooth service
to let BT enable in quiet mode
Change-Id: I546f3ceb298082a9c9a698f406379470e3cc0d4f
2012-08-14 00:18:07 -07:00
Jeff Brown
1d89d2b56d
am adeadda2: am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev
...
* commit 'adeadda2027ecc87399ce4504145a5bcc78e1bec':
Add a toString() method to Sensor for debugging purposes.
2012-08-13 23:19:44 -07:00
Jeff Brown
caaeda955b
Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev
2012-08-13 23:14:56 -07:00
Christopher Tate
4c02cca213
am f5c0cf90: am bf7d2220: Merge "Don\'t back up / restore non-primary users\' data" into jb-mr1-dev
...
* commit 'f5c0cf90838ecb95893c9679fb5e352343fac12a':
Don't back up / restore non-primary users' data
2012-08-13 18:02:52 -07:00
Christopher Tate
aac71ff465
Don't back up / restore non-primary users' data
...
For now only the device owner "user" gets cloud backups. Also, only the
device owner account has access to local backup/restore.
Bug 6956438
Change-Id: I87d7ba5969e606c23f4214469f9bf2fd47a6c61b
2012-08-13 17:36:14 -07:00
Daniel Sandler
08d05e3d1d
New status bar capable of multiple sliding panels.
...
There are some visual glitches but almost everything should
be put back pretty much where it was.
Change-Id: I2f9b0591d44599b07bd83f03c4e09e6dd98e1448
2012-08-13 15:23:51 -04:00
Amith Yamasani
dda851ce9a
am 7871b629: am f83d2d6f: Merge "User Manager service to manage users and query user details" into jb-mr1-dev
...
* commit '7871b629a63a542fb81179c9239c21255a7a42ad':
User Manager service to manage users and query user details
2012-08-11 21:42:07 -07:00
Amith Yamasani
f83d2d6f6b
Merge "User Manager service to manage users and query user details" into jb-mr1-dev
2012-08-11 21:37:08 -07:00
Amith Yamasani
258848d2ae
User Manager service to manage users and query user details
...
Moved a bunch of methods from PackageManager to UserManager.
Fix launching of activities from recents to correct user.
Guest creation APIs
Change-Id: I0733405e6eb2829675665e225c759d6baa2b708f
2012-08-11 18:24:07 -07:00
Daniel Sandler
467aa0d747
am 52d5ab27: am f7178d3c: Allow the secure keyguard to engage behind Dreams.
...
* commit '52d5ab27f18ad23bc12a48349cab44829b438d4d':
Allow the secure keyguard to engage behind Dreams.
2012-08-11 07:46:16 -07:00
Daniel Sandler
f7178d3cad
Allow the secure keyguard to engage behind Dreams.
...
TYPE_DREAM windows are now considered for relevant window
flags alongside application windows.
Bug: 6961616
Change-Id: Idee3303276a8b69c7f07de1d6acdce64c6e1b863
2012-08-11 00:55:14 -04:00
Jeff Brown
6a2ef12753
Add a toString() method to Sensor for debugging purposes.
...
Also made the class final, since it cannot be instantiated
by applications.
Change-Id: I540ad56d19debd99426d37b9b63c163827b4c2fc
2012-08-10 20:52:22 -07:00
Haoyu Bai
0412423f06
Setup idletimer for network interface.
...
Cherry-picked from commit f71ca8a572 in
master. DO NOT MERGE
Change-Id: I6101c7ae041b4cc1237ce7a9983753dbdfa301d3
2012-08-10 15:58:34 -07:00
Adam Powell
9cfa9b17a7
am 5681861a: am c47f80f1: Merge "Don\'t assume a default of \'false\' for TwoStatePreference" into jb-mr1-dev
...
* commit '5681861a9e104b80f9f6c7c8cf8ef313ed1cc128':
Don't assume a default of 'false' for TwoStatePreference
2012-08-10 14:44:25 -07:00
Adam Powell
c47f80f1ae
Merge "Don't assume a default of 'false' for TwoStatePreference" into jb-mr1-dev
2012-08-10 14:39:28 -07:00
Adam Powell
c1b07211b8
Don't assume a default of 'false' for TwoStatePreference
...
TwoStatePreference would treat a default value of false as having no
effect since it matched the initial value of the internal field. This
caused asymmetric behavior around persistence and listener
notification when the default was true (persisted) vs. false (not
persisted).
Standard behavior for most Preferences is to persist the default
value. Make TwoStatePreference (CheckBoxPreference and
SwitchPreference) follow this pattern.
Bug 5722690
Change-Id: I8b3cf55efc5dfd573b511913b48ced017f0432d8
2012-08-10 14:36:53 -07:00
Jean-Baptiste Queru
bc870a8c3d
am 2287e17c: am 06439fd2: am cb80cb70: am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
...
* commit '2287e17c7612ee3dd0a10cab68c693d6f8333de2':
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
2012-08-10 12:52:39 -07:00
Jean-Baptiste Queru
06439fd29f
am cb80cb70: am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
...
* commit 'cb80cb700d15319c20686998e822aed32a56adf5':
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
2012-08-10 12:44:12 -07:00
Daniel Sandler
1bb219bdcf
am 52ea2140: am 9252dbd3: Add fullscreen to Dream.lightsOut().
...
* commit '52ea21400ba5886a4a91c815278248d8e9bcfc51':
Add fullscreen to Dream.lightsOut().
2012-08-10 11:03:03 -07:00
Daniel Sandler
9252dbd314
Add fullscreen to Dream.lightsOut().
...
Also don't go into lightsOut() by default in
onAttachedToWindow(), in case some dream doesn't want to do
that.
We should probably make this even more flexible, but
this is a start.
Change-Id: I606b42a288259902e89d59595ad60548a89866da
2012-08-10 13:57:32 -04:00
Jean-Baptiste Queru
cb80cb700d
am 37548994: Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
...
* commit '37548994e69292932e9e2fafb7cba6c53e3a2bcd':
StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test.
2012-08-10 09:26:53 -07:00
Jean-Baptiste Queru
37548994e6
Merge "StorageManager: fix issue that GREF has increased to 2011 in system server with intel stress test."
2012-08-10 09:04:05 -07:00
Daniel Sandler
045b878748
am 4f924dd2: am 69509926: Merge "More termination conditions for Dreams." into jb-mr1-dev
...
* commit '4f924dd254b2798aaa0a1ece06163babcfdb954d':
More termination conditions for Dreams.
2012-08-10 07:30:17 -07:00
Daniel Sandler
6950992645
Merge "More termination conditions for Dreams." into jb-mr1-dev
2012-08-10 07:26:15 -07:00
Daniel Sandler
a2fbe53f1e
More termination conditions for Dreams.
...
Default implementation of Dreams will finish() on KEYCODE_BACK.
PhoneStatusBar will awaken() from any Dream when the Home key is pressed.
Change-Id: I55e2a5d533a7fb93debc4c54514dba3b9098f009
2012-08-10 01:19:03 -04:00
Adam Powell
14de557208
am 1b8e5de1: am f6e80228: Merge "Sync fling physics between Scroller/OverScroller" into jb-mr1-dev
...
* commit '1b8e5de1beff2f54797e03c05cca1e8043895495':
Sync fling physics between Scroller/OverScroller
2012-08-09 17:32:01 -07:00
Adam Powell
f6e802283c
Merge "Sync fling physics between Scroller/OverScroller" into jb-mr1-dev
2012-08-09 17:22:29 -07:00
Adam Powell
990dfc6f90
Sync fling physics between Scroller/OverScroller
...
Bug 6793537
Have the default fling physics for Scroller follow the newer patterns
from OverScroller.
Make some constants determined by DisplayMetrics density in
OverScroller per-instance rather than static.
Change-Id: I5308e4bb8eca63e95cf3f1eee1ba4fa5391023b0
2012-08-09 16:55:08 -07:00
mike wakerly
ceff341550
am 1022b999: Merge "Fix typo in UsbManager javadoc." into jb-dev
...
* commit '1022b9999de8fb022db6923a55e37ffc7dfca176':
Fix typo in UsbManager javadoc.
2012-08-09 16:49:07 -07:00
mike wakerly
0099d67d68
Fix typo in UsbManager javadoc.
...
Closes http://b.android.com/32863
Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 16:31:26 -07:00
mike wakerly
2665c988af
am af4fa8d7: am 8046b5e0: Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev
...
* commit 'af4fa8d73981126bfbdd68f0e17640624bb1693c':
UsbRequest: set ByteBuffer.position() upon success.
2012-08-09 16:14:13 -07:00
mike wakerly
8046b5e00d
Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev
2012-08-09 16:10:11 -07:00
Irfan Sheriff
c31b9f9bf9
am d50f0761: am 35cf42d0: Merge "Add control to disable suspend optimizations" into jb-mr1-dev
...
* commit 'd50f076108a4600dd4971d5947ff59885d09f2c7':
Add control to disable suspend optimizations
2012-08-09 16:06:24 -07:00
Adam Powell
dafa2f92fb
am 61077382: am a7bbbabc: Merge "Some simple skip-layout optimizations for ImageView" into jb-mr1-dev
...
* commit '610773827876d811da509640b89a9f973460a4ad':
Some simple skip-layout optimizations for ImageView
2012-08-09 16:06:17 -07:00
Irfan Sheriff
35cf42d0b6
Merge "Add control to disable suspend optimizations" into jb-mr1-dev
2012-08-09 15:53:17 -07:00
Irfan Sheriff
3fb4ba616e
Add control to disable suspend optimizations
...
Add an advanced setting that allows user to turn off power savings at screen off.
Bug: 5885175
Change-Id: I2dd013b86d7500a2ad1f9ec75d86551808f05543
2012-08-09 15:50:55 -07:00
mike wakerly
a3665ba95d
UsbRequest: set ByteBuffer.position() upon success.
...
Also clears allocated buffer before copying.
Closes http://b.android.com/28023
Bug: 5385026
Bug: 6766413
Change-Id: Icf2c1d45db4fb2a9bd1fcfdb29aa7308034faaf0
2012-08-09 15:28:10 -07:00
Adam Powell
a7bbbabc15
Merge "Some simple skip-layout optimizations for ImageView" into jb-mr1-dev
2012-08-09 15:19:46 -07:00
Adam Powell
f96ce02613
Some simple skip-layout optimizations for ImageView
...
Mirror the optimization from setImageDrawable into setImageResource
and setImageURI where we won't requestLayout() if the drawable's size
didn't change.
Bug 6359116
Change-Id: Iaae2100f3bddb2737628e31483b471c9e22d945f
2012-08-09 15:09:53 -07:00
Chet Haase
0109e70c91
am 229060e9: am 4e44348f: Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev
...
* commit '229060e9f72c24c08845029f8340e17b9b3210e1':
Fix shift/mask error in ArtbEvaluator
2012-08-09 14:56:25 -07:00
Chet Haase
4e44348f91
Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev
2012-08-09 14:52:25 -07:00
Chet Haase
9b5599894b
Fix shift/mask error in ArtbEvaluator
...
Shifting from the left copies the MSB along with it. This causes a problem
in ArgbEvaluator, which shifts the top byte down by 24 for the start/end
colors, and then uses those values to interpolate alpha values. The correct
appraoch (used with the other color components) is to mask by 0xff after the
shift.
Issue #6960514 External bug: ArgbEvaluator can't evaluate alpha value properly
Change-Id: I750d38ddfecc5f30d8dab7c6d27d1a7ac06361c3
2012-08-09 14:16:29 -07:00
mike wakerly
61fe5165f1
am 34e45175: am 1567a434: Fix typo in UsbManager javadoc.
...
* commit '34e45175e2e1bbd5869b5f3f90ae0509e12f25eb':
Fix typo in UsbManager javadoc.
2012-08-09 11:41:02 -07:00
mike wakerly
1567a4341b
Fix typo in UsbManager javadoc.
...
Closes http://b.android.com/32863
Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 11:25:16 -07:00