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
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
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
1567a4341b
Fix typo in UsbManager javadoc.
...
Closes http://b.android.com/32863
Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
2012-08-09 11:25:16 -07:00
Jeff Brown
1670dc9abf
Merge "Add FloatMath.exp." into jb-mr1-dev
2012-08-08 18:29:08 -07:00
Jeff Brown
5d728bb9ff
Add FloatMath.exp.
...
Change-Id: I7f215e5fd4cb942ddee56eebaef04be565ac79f3
2012-08-08 18:23:53 -07:00
Jeff Brown
b7df3a714f
Merge "Make display info accessible from hidden api." into jb-mr1-dev
2012-08-08 18:21:27 -07:00
Nick Kralevich
5a28605155
Merge "PackageParser: remove temporary code." into jb-mr1-dev
2012-08-08 17:19:06 -07:00
Amith Yamasani
8264408f59
Start the correct settings from the status bar.
...
Added a new method to Context: startActivityAsUser() requiring the
INTERACT_ACROSS_USERS_FULL permission.
Show the correct Recents list, based on current user.
Added a getRecentTasksForUser() in ActivityManager. Hidden and requires
the INTERACT_ACROSS_USERS_FULL permission.
Change-Id: If5b56465efdd3ead36601a3b51ed4af157bbf35c
2012-08-08 16:52:53 -07:00
Jeff Sharkey
82f479d064
Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev
2012-08-08 16:22:23 -07:00
Adam Powell
08532ab9ba
Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev
2012-08-08 16:04:35 -07:00
Adam Powell
6322af54cf
Fix indeterminate ProgressBars with weird sizes and padding; optimize
...
ActionBar measurement
Fix a bug where preserved aspect ratios in ProgressBar indeterminate
drawables were causing drawable bounds to be calculated incorrectly
when the ProgressBar had padding specified.
Measure the ActionBar menu view's height with EXACT measure mode,
preventing an extra measure pass to match child heights for some
cases.
Change-Id: I8c4678662a015b57ba2686d5b5c5fc27d4ef8d36
2012-08-08 16:02:36 -07:00
Nick Kralevich
a30a4806ac
PackageParser: remove temporary code.
...
This code isn't needed and wasn't doing what I thought
it was doing.
Bug: 3306452
Change-Id: Ifeab672e379fd331a6f0ef1504eebb29aa6b4466
2012-08-08 15:39:45 -07:00
Romain Guy
c89b14bba0
It seems that apparently useless public APIs are actually useful
...
Bug #6953651
Change-Id: Ic47ce504e63262711f5d3edc76f7d2b9c12471ad
2012-08-08 14:58:54 -07:00
Subir Jhanb
603af61a7c
Add a new permission to have access to Gal Provider
...
BUG:6897999
Change-Id: Ie60963b7f3911b402b971e794178754e1b4f0a43
2012-08-08 14:31:45 -07:00
Jean-Baptiste Queru
9951b7c4f0
am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit 'e5c46faefb9deda885cff308ec9b1926636ca8bc':
Return early when checking divider before child zero.
2012-08-08 14:08:42 -07:00
Jean-Baptiste Queru
88a4292186
am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:08:38 -07:00
Jean-Baptiste Queru
e5c46faefb
am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit '6d0dd51ebb170a89bea614a558b96f1dff3e7723':
Return early when checking divider before child zero.
2012-08-08 14:04:08 -07:00
Jean-Baptiste Queru
807c7ae00b
am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:04:02 -07:00
Rich Cannings
a56d9cecee
Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
2012-08-08 13:50:56 -07:00
Jean-Baptiste Queru
6d0dd51ebb
Merge "Return early when checking divider before child zero."
2012-08-08 13:20:07 -07:00
Jean-Baptiste Queru
7835d4fb4e
Merge "Fix SurfaceView notifies on invalid surfaces."
2012-08-08 13:20:00 -07:00
Jean-Baptiste Queru
86d09388ee
am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit 'bce413587973eae29a783d7e273dc2f7db06f7c9':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:11:33 -07:00
Jean-Baptiste Queru
04c7923c74
am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '749135722c6edb681fc27fcbab5beba25f938d82':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:11:28 -07:00
Jean-Baptiste Queru
bce4135879
am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:08:31 -07:00
Jean-Baptiste Queru
749135722c
am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:08:27 -07:00
Jean-Baptiste Queru
9ab84c203f
Merge "Fix wrong count return for getPhoneSignalStrengthCount"
2012-08-08 12:59:06 -07:00
Rich Cannings
e1d7c711df
Revert "Pass URLs to package verifiers"
...
This reverts commit 24713907fe
Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
2012-08-08 12:46:06 -07:00
Jean-Baptiste Queru
6fb8fe9aba
Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
2012-08-08 12:06:26 -07:00
Nick Kralevich
2caec6c682
Fix link typo.
...
Change-Id: I182b9c04caddcc4a985f206eddf5c23b06afe0e3
2012-08-08 11:33:17 -07:00
Jean-Baptiste Queru
de9d40d445
am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak"
...
* commit '64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80':
Fix cursor memory leak
2012-08-08 10:55:46 -07:00
Jean-Baptiste Queru
c98db2a7d1
am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type."
...
* commit '425d13a0aeded1f750addb2c64cd693109661415':
Adds missing Bluetooth as network type.
2012-08-08 10:55:39 -07:00
Jean-Baptiste Queru
64ed6b2cfa
am d77d17c2: Merge "Fix cursor memory leak"
...
* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700':
Fix cursor memory leak
2012-08-08 10:54:04 -07:00
Jean-Baptiste Queru
425d13a0ae
am 2278e60c: Merge "Adds missing Bluetooth as network type."
...
* commit '2278e60c39f937b6eee14fbf0094d4be92d7f06b':
Adds missing Bluetooth as network type.
2012-08-08 10:53:52 -07:00
Nick Kralevich
9d16c219f1
Merge "Content Providers: change default for android:exported" into jb-mr1-dev
2012-08-08 10:50:05 -07:00
Jean-Baptiste Queru
d77d17c28d
Merge "Fix cursor memory leak"
2012-08-08 10:44:50 -07:00
Jean-Baptiste Queru
2278e60c39
Merge "Adds missing Bluetooth as network type."
2012-08-08 10:43:20 -07:00
Dianne Hackborn
537915828b
Merge "More mult-user API work." into jb-mr1-dev
2012-08-08 10:22:49 -07:00
Daniel Sandler
5927d957ea
Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev
2012-08-08 08:47:40 -07:00
Daniel Sandler
fdb7c36a10
Migrate Dreams default settings to DatabaseHelper.
...
Also switch Dreams on for all charging devices by default.
Change-Id: Iccbcc2906d55214320b2f467e88ba9cb188f4886
2012-08-08 08:38:48 -04:00
Jeff Brown
2ab1b7d9ab
Make display info accessible from hidden api.
...
Change-Id: I83f3899b9ef10da4fe9a71f40dee8e940b32ec46
2012-08-08 02:06:14 -07:00
Matthew Xie
1ae86869bc
Merge "Auto connection/disconnection related changes" into jb-mr1-dev
2012-08-08 00:31:53 -07:00
Dianne Hackborn
7d19e0242f
More mult-user API work.
...
- You can now use android:singleUser with receivers and providers.
- New API to send ordered broadcasts as a user.
- New Process.myUserHandle() API.
For now I am trying out "user handle" as the name for the numbers
representing users.
Change-Id: I754c713ab172494bb4251bc7a37a17324a2e235e
2012-08-07 19:19:22 -07:00
Adam Powell
96f1ee9867
Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev
2012-08-07 18:04:16 -07:00
Adam Powell
0090f20001
Fix a padding resolution bug for adapter-based views
...
If padding has not been resolved by the time measure() is called,
resolve it.
Bug 6938579
Change-Id: Idd3ffa3e4e441cd462d6594b1e20d153d7632994
2012-08-07 17:16:49 -07:00
Romain Guy
b260f3531b
Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339 " into jb-mr1-dev
2012-08-07 14:52:35 -07:00
Romain Guy
2440e670de
Catch padding changes in ViewGroup to properly clip children
...
Bug #6886339
RTL support introduced a new way to handle padding which broke
existing behavior in ViewGroup.setPadding(). The new code path
was not notifying ViewGroup which would prevent it from setting
a flag used to clip children.
Change-Id: I584143714cb81fd664b4ecd9fb51d56bae04ba05
2012-08-07 14:43:43 -07:00