Jeff Brown
919a4cdfe2
am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
...
* commit '3ca5971339c7eba61388aa3e26a1b3d02c5ccdf6':
Support HDMI hotplug.
2012-09-21 17:49:35 -07:00
Jim Miller
f084208bdf
am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
...
* commit '1ed9fa10de3e94678ddb2929936caa3ff4164cf8':
Make DPM API for disabling keyguard widgets more generic
2012-09-21 17:49:00 -07:00
rich cannings
3b7f3cbfe8
am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
...
* commit '04c2bb86ca47378c99576c5ff7cb8283683dc935':
Add setting to skip verifying ADB installs
2012-09-21 17:48:17 -07:00
Daniel Sandler
0ab7b9d0f8
am df655d09: Merge "Fix javadocs to fix build." into jb-mr1-dev
...
* commit 'df655d09c0dc4ce12ba4b191c1ebb888f123a3b1':
Fix javadocs to fix build.
2012-09-21 17:47:46 -07:00
John Spurlock
7492091128
am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev
...
* commit '2250550187ed7a2bd98d5f861151b49db5635f6e':
Additions to Dream public api.
2012-09-21 17:47:36 -07:00
Romain Guy
18c166bcd6
am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819 " into jb-mr1-dev
...
* commit '3f7c246f3ea85af9fb98cba37387bb55658d4614':
Update layers in a single batch at the beginning of a frame Bug #7186819
2012-09-21 17:46:55 -07:00
Bjorn Bringert
3661ee1e8b
am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev
...
* commit '45b07b9427cc736bf4fd5658ef2f30884ba4d9a4':
Add intents to open text and video from search.
2012-09-21 17:46:43 -07:00
Dan Morrill
26cee9f355
am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev
...
* commit '466bd636812684aeb8161f144597cc3b3ed39078':
New method returning user metadata.
2012-09-21 17:46:29 -07:00
Daniel Sandler
faded6e63b
am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev
...
* commit '0887711d0f76d858501fd017259ddfdc1950eb3f':
Add Notification.Builder.setShowWhen(boolean).
2012-09-21 17:45:35 -07:00
Michael Jurka
1c46536721
am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev
...
* commit '7566abd305a2b3060ae541055ed04f087f5266ec':
Add support for changing status widget on security screen
2012-09-21 17:45:04 -07:00
Wu-cheng Li
baffb198a8
am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev
...
* commit 'c9cc62b96561933dd9257a78c6749195fbe8fdd3':
Add secure version of image capture intent.
2012-09-21 17:44:59 -07:00
Amith Yamasani
38e69e96f4
am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev
...
* commit '74defbf202de713aa6ae19fbbf2ea5c318ccd11c':
Query users excluding any being removed
2012-09-21 17:44:50 -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
Fabrice Di Meglio
01143c16bb
am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev
...
* commit '8da91a699cefccb8d9abf2b72221bc8c1f1874fc':
Fix bug #7205072 Text inside popup window is too close to the edge
2012-09-21 13:35:23 -07:00
Jeff Brown
a41ebd4ad7
am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev
...
* commit 'f2eb2e3e0343da98f8bfe29a6c61d85f1cd7fbd8':
Fix javadoc.
2012-09-21 13:35:18 -07:00
Adam Cohen
44f52cf7e1
am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev
...
* commit '11a6450e543d5c178c60ce2216fad1b29bf15457':
Fixing partiallyUpdateAppWidget to cache the new changes
2012-09-21 13:35:02 -07:00
John Reck
cea904c91e
am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev
...
* commit 'e6ff47840fc6d8ac5ba551101684011e328b4caa':
Use less static synchronized
2012-09-21 13:34:36 -07:00
Eric Laurent
41da58338f
am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev
...
* commit '6730c3c69f84d799198365e0692b79be72b0eeb7':
Fix safe volume warning message flickering
2012-09-21 13:34:29 -07:00
Christopher Tate
5d978525bc
am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev
...
* commit '58e7f73c6e2d6583be0beabc95e7ac430bef0eb4':
Multiuser awareness in content observer infrastructure
2012-09-21 13:33:34 -07:00
Dianne Hackborn
22b46b6fa4
am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev
...
* commit '6de76d21ff60818f8b296fc8f645897203f475da':
Implement multi-user PackageMonitor.
2012-09-21 13:32:57 -07:00
Dianne Hackborn
342737d543
am e6f63800: Merge "Fix issue #7196015 : system_server deadlock during setup wizard" into jb-mr1-dev
...
* commit 'e6f6380027d5c209eb17ec2567f00356ad32038a':
Fix issue #7196015 : system_server deadlock during setup wizard
2012-09-21 13:32:45 -07:00
Irfan Sheriff
917fc95cac
am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev
...
* commit '314488b791d36756504ee593f818f04b4cd24893':
Captive check for both mobile and wifi
2012-09-21 13:32:22 -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
Lei Zhang
534a076c81
Fix auto-merger error in I74c0644c6938d28c20c42d88d995ffb56a71d703
...
Change-Id: If199aa3f01d1a7ea3f298504c0de4aa9a96e7451
2012-09-21 12:39:39 -07:00
John Spurlock
2250550187
Merge "Additions to Dream public api." into jb-mr1-dev
2012-09-21 12:28:35 -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
Jason Simmons
f445a77bf3
resolved conflicts for merge of d053554f to jb-mr1-aah-dev
...
Change-Id: I8540083f7fd04e252c8879475f247ea6bbde8159
2012-09-21 10:38:01 -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
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
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
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
Dan Morrill
e4ab16ad98
New method returning user metadata.
...
Change-Id: Ic1a42cf54152fe2e6bcd01b1bd9f1edb77d1710e
2012-09-20 20:25:55 -07:00
Michael Jurka
20c41d5382
Add support for changing status widget on security screen
...
Change-Id: I080fd89eb84445604c602b6e807b55153a7ee129
2012-09-20 19:19:41 -07:00
Fabrice Di Meglio
8da91a699c
Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev
2012-09-20 18:51:23 -07:00
Jeff Brown
f2eb2e3e03
Merge "Fix javadoc." into jb-mr1-dev
2012-09-20 18:47:50 -07:00
Fabrice Di Meglio
3e27c34e0e
Fix bug #7205072 Text inside popup window is too close to the edge
...
- if targetSDK is pre JB-MR1 then we really need to use the User padding
when it is defined and valid
Change-Id: If416fbc181b8784de446e9171529147ab03c9373
2012-09-20 18:27:17 -07:00
Adam Cohen
11a6450e54
Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev
2012-09-20 18:09:11 -07:00
Justin Koh
b4641b5cd4
Merge "Converts hover touch events to trackball events" into jb-mr1-aah-dev
2012-09-20 18:04:49 -07:00
Jeff Brown
a95a3b494f
Fix javadoc.
...
Bug: 7172727
Change-Id: I55ee0099ea2e61f5f0a9de7b434fb8fb858ad5f9
2012-09-20 17:49:47 -07:00