Dianne Hackborn
19a22ced89
am 033e60e8: am c9e94ea6: Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
...
* commit '033e60e87aa5c704caf8d00b30b323dd126c4151':
Fix issue #7213113 : Remove old intent resolver
2012-09-24 00:52:09 -07:00
Adam Cohen
c328f7f8f6
am dce17917: am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev
...
* commit 'dce17917103d25e18063a7d71e592e131f8e0bd3':
Changing public method to @hide, doesn't have to be public
2012-09-24 00:52:02 -07:00
Svetoslav Ganov
dddf962f1c
am a586a3c9: am 38533ea5: Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
...
* commit 'a586a3c9a7d2e317b8b5025faa77f088aed38fd4':
NPE in AcitivtyChooserModel.
2012-09-24 00:51:56 -07:00
Svetoslav Ganov
c250400901
am 03037841: am 08681add: Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
...
* commit '03037841d4ccce4382ccbf55eddd96c427eb5861':
Day numbers in CalendarView have incorrect size.
2012-09-24 00:51:48 -07:00
Victoria Lease
c5d684a5ee
am 15edd2d5: am b77b3cfe: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
...
* commit '15edd2d5ad8ba17e183b5f1222ef39150df38397':
Get your own cursor Drawables, WebViewClassic!
2012-09-24 00:51:44 -07:00
Eino-Ville Talvala
5d0c5079ce
am eace371e: am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
...
* commit 'eace371ee01f8e61731d86110ec84258994eeded':
NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
2012-09-24 00:51:20 -07:00
Jeff Brown
d571122db5
am 1022a785: am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
...
* commit '1022a785e52384dc8503127df1ceaababcd88a1a':
Support HDMI hotplug.
2012-09-24 00:51:06 -07:00
Jim Miller
0b0c0efabf
am 998f94c9: am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
...
* commit '998f94c96afee8d3c76dcaf64f3f23dfdf8d8ce5':
Make DPM API for disabling keyguard widgets more generic
2012-09-24 00:50:28 -07:00
rich cannings
0f2714414a
am 83abadb0: am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
...
* commit '83abadb06a21ba54df6cc8a5c1f3c48253488430':
Add setting to skip verifying ADB installs
2012-09-24 00:49:36 -07:00
Daniel Sandler
3cfe94e792
am 89add82a: am df655d09: Merge "Fix javadocs to fix build." into jb-mr1-dev
...
* commit '89add82aa63af50cf407ff746baf92bd37336e02':
Fix javadocs to fix build.
2012-09-24 00:48:58 -07:00
John Spurlock
37a16ee466
am b8016f7a: am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev
...
* commit 'b8016f7acecf8ff43b98c0285c7d9910577934aa':
Additions to Dream public api.
2012-09-24 00:48:48 -07:00
Dianne Hackborn
c9e94ea645
Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
2012-09-21 17:05:47 -07:00
Dianne Hackborn
52c62344c5
Fix issue #7213113 : Remove old intent resolver
...
Also make the query package restart broadcast protected like the
documentation says it should be.
Change-Id: I445166111318a02f2f2b1ab0dff9c641a441c20b
2012-09-21 17:04:16 -07:00
Adam Cohen
8562cb5982
Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev
2012-09-21 16:56:31 -07:00
Svetoslav Ganov
38533ea514
Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
2012-09-21 16:55:29 -07:00
Adam Cohen
bd1e0076c6
Changing public method to @hide, doesn't have to be public
...
Change-Id: I4c87b154fd99376a0337f9fc65024e13ddb74da5
2012-09-21 16:51:50 -07:00
Svetoslav Ganov
08681adda0
Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
2012-09-21 16:32:02 -07:00
Victoria Lease
b77b3cfe41
Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
2012-09-21 16:29:43 -07:00
Eino-Ville Talvala
5ce25d7170
Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
2012-09-21 16:05:59 -07:00
Jeff Brown
3ca5971339
Merge "Support HDMI hotplug." into jb-mr1-dev
2012-09-21 15:51:41 -07:00
Jeff Brown
e87bf03076
Support HDMI hotplug.
...
Bug: 7206678
Change-Id: Ia5212b16658a5f5a2ccf8528eca7bebd45ca857a
2012-09-21 15:34:32 -07:00
Jim Miller
1ed9fa10de
Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
2012-09-21 15:21:33 -07:00
rich cannings
4e5753f5f6
Add setting to skip verifying ADB installs
...
Create a setting "verifier_verify_adb_installs" to allow developers to control
package verification on ADB installs only. If package verification is enabled,
the setting will:
0, Do not perform package verification on apps installed through ADB/ADT/USB
and perform package verification on all other installs.
1, Use package verification on all installs. (Default)
Bug: 7183252
Change-Id: I9d3eb8abb5ba5e93f8634d3135794e92ff6273b6
2012-09-21 13:26:15 -07:00
Daniel Sandler
df655d09c0
Merge "Fix javadocs to fix build." into jb-mr1-dev
2012-09-21 13:01:58 -07:00
John Spurlock
5e416d8803
Fix javadocs to fix build.
...
Change-Id: I6d7d63b9322f225124f722a245c1222540afbff4
2012-09-21 15:56:13 -04:00
Romain Guy
7fdf367d7a
am 0b697061: am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819 " into jb-mr1-dev
...
* commit '0b69706103dc6ddf765fa2e86265a6428f6728bb':
Update layers in a single batch at the beginning of a frame Bug #7186819
2012-09-21 12:46:59 -07:00
Bjorn Bringert
5c28267461
am f9173428: am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev
...
* commit 'f9173428688ce2b6192e72fd70d18ff74cbb34be':
Add intents to open text and video from search.
2012-09-21 12:46:50 -07:00
Dan Morrill
9589c79914
am 7c987ca4: am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev
...
* commit '7c987ca47cf37af719d05b161e7b516c0dee8740':
New method returning user metadata.
2012-09-21 12:45:08 -07:00
Daniel Sandler
94b5cd9b37
am 89e27caa: am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
...
* commit '89e27caa0cc4a488eaf202c2478204238f95fc0a':
Add Notification.Builder.setShowWhen(boolean).
2012-09-21 12:44:19 -07:00
John Spurlock
2250550187
Merge "Additions to Dream public api." into jb-mr1-dev
2012-09-21 12:28:35 -07:00
Svetoslav Ganov
0c6f3795b3
Day numbers in CalendarView have incorrect size.
...
1. The text size of the paint for drawing week days was never set.
bug:6933206
Change-Id: Ie50286d46e2c21a9c2d5f51b309a49f17d46d4b9
2012-09-21 11:49:05 -07:00
Svetoslav Ganov
abcaeea1ee
NPE in AcitivtyChooserModel.
...
1. If there is not current intent sent and the client tries to
choose an activity a NPE occurs. The code in chooseActivity
now checks for null intent. Note that having a null intent
is a valid state.
bug:6738922
Change-Id: I91d4415649ce070d4fa4aa187e9eac02928dd38c
2012-09-21 11:10:27 -07:00
Romain Guy
3f7c246f3e
Merge "Update layers in a single batch at the beginning of a frame Bug #7186819 " into jb-mr1-dev
2012-09-21 10:50:12 -07:00
Bjorn Bringert
45b07b9427
Merge "Add intents to open text and video from search." into jb-mr1-dev
2012-09-21 10:30:20 -07:00
Dan Morrill
466bd63681
Merge "New method returning user metadata." into jb-mr1-dev
2012-09-21 09:53:57 -07:00
John Spurlock
d5c582c494
Additions to Dream public api.
...
- lightsOut() -> setLightsOut(boolean)
(deprecated lightsOut, will remove once all baked-in dreams are updated)
- Added ability to keep the screen bright (default = false).
- Lights out is now true by default.
- Consistent setters(setXxx) + getters(isXxx) for
interactive, lightsOut, fullscreen, and screenBright dream attributes.
Can set attributes at any time (even before window is created).
- Fleshed out javadocs for public api.
- Reordered things a bit.
- Added example of manifest dream declaration ready for copypasta.
- Removed unused action constant, added category constant.
Bug:7172816
Bug:7111868
Change-Id: I721db7a1a5e5ad047a3723b4d5141ef53b0970af
2012-09-21 12:37:11 -04:00
Victoria Lease
37563c5249
Get your own cursor Drawables, WebViewClassic!
...
These are shared resources! You can't just animate *everyone's*
cursors!
This is a hand-merge of Icdc86af4fba427a352019cd3e2017f97a3b9fdba
from jb-dev branch. I'm not sure why it wouldn't automerge, as it
seemed pretty straightforward...
Bug: 7110290
Change-Id: I131a611b9e16699a51d3769658f079c2ae4cf262
2012-09-21 09:31:11 -07:00
Daniel Sandler
0887711d0f
Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
2012-09-21 07:30:43 -07:00
Florian Uunk
b1ac72b54b
Add intents to open text and video from search.
...
We're adding support for searching for text (books, magazines) and video
(tv, movies).
Bug: 7208141
Change-Id: I19dd2f745518a96b22b02a29c1ab9a89d53cc0cc
2012-09-21 15:15:04 +01:00
Michael Jurka
8f7ac705f8
am 3b3bd0f5: am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
...
* commit '3b3bd0f5031c6dafcd34c1b6335c33d1f877c01b':
Add support for changing status widget on security screen
2012-09-21 01:15:32 -07:00
Wu-cheng Li
17a5666183
am ff05108d: am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev
...
* commit 'ff05108dc6a0213bbce551554e426e8d8f20a418':
Add secure version of image capture intent.
2012-09-21 01:13:54 -07:00
Michael Jurka
7566abd305
Merge "Add support for changing status widget on security screen" into jb-mr1-dev
2012-09-21 01:10:53 -07:00
Wu-cheng Li
c9cc62b965
Merge "Add secure version of image capture intent." into jb-mr1-dev
2012-09-21 01:08:00 -07:00
Romain Guy
11cb642756
Update layers in a single batch at the beginning of a frame
...
Bug #7186819
Change-Id: Ice5926dfedfb3be3a3064e65008dafa2852407da
2012-09-21 00:39:43 -07:00
Wu-cheng Li
37959ef70f
Add secure version of image capture intent.
...
bug:7141738
Change-Id: I77789ffb53e70efd946f331286a895b7a1239661
2012-09-21 14:47:47 +08:00
Amith Yamasani
f16c559cff
am e6a5c571: am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev
...
* commit 'e6a5c571c3bb174fe66d2f418070c549bc195c98':
Query users excluding any being removed
2012-09-20 23:13:21 -07:00
Amith Yamasani
74defbf202
Merge "Query users excluding any being removed" into jb-mr1-dev
2012-09-20 23:08:45 -07:00
Amith Yamasani
920ace0bbc
Query users excluding any being removed
...
Keep track of user creation and last logged-in time.
adb shell dumpsys users
User switcher shouldn't show users about to be removed.
No need to check for singleton for activities.
Bug: 7194894
Change-Id: Ic9a59ea5bd544920479e191d1a1e8a77f8b6ddcf
2012-09-20 22:33:43 -07:00
Fabrice Di Meglio
69235be493
am eedda1d1: am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev
...
* commit 'eedda1d1c66c736b68027c452402292edef4d4ae':
Fix bug #7205072 Text inside popup window is too close to the edge
2012-09-20 20:28:37 -07:00
Jeff Brown
a627db895e
am 2872e019: am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev
...
* commit '2872e01929dc2fcfdec03166b9a16577743b59b8':
Fix javadoc.
2012-09-20 20:28:33 -07:00