Andreas Huber
ab4cd45133
P2p API for WFD
...
Change-Id: I3914a515313654f7032d8bb102afebf0ed776783
2012-09-06 09:06:13 -07:00
Selim Gurun
18e8768067
Merge "remove defunct javascript interface" into jb-mr1-dev
2012-09-05 15:04:07 -07:00
Jason Sams
6d617c2ddd
Merge "Stabilize perf data." into jb-mr1-dev
2012-09-05 13:50:36 -07:00
Jason Sams
3e777c7970
Merge "Add ColorMatrix Intrinsic." into jb-mr1-dev
2012-09-05 13:48:58 -07:00
Jim Miller
27230f076a
Merge "Better flow for SIM PIN/ SIM PUK screens in keyguard." into jb-mr1-dev
2012-09-05 13:45:30 -07:00
Jason Sams
76fb2973b9
Stabilize perf data.
...
Change-Id: I75fb31b1bb6e6a7a5a82b86fd4a6639dd328ceaa
2012-09-05 13:18:43 -07:00
Jim Miller
9ca26e4365
Merge "Don't depend on LockPatternUtils to get DevicePolicyManager" into jb-mr1-dev
2012-09-05 12:49:31 -07:00
Dmitry Shmidt
91a65b5339
Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev
2012-09-05 12:39:23 -07:00
Daniel Sandler
fd5494b8ef
Merge changes I4ef284da,Ie8cc69bd into jb-mr1-dev
...
* changes:
Make the SystemUI stop the screen saver when a full-screen notification is posted.
Do not play sounds or vibes for background users' notifications.
2012-09-05 12:38:25 -07:00
Jean-Baptiste Queru
ec098efcb1
am 342c6bc8: am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
...
* commit '342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993':
Am: Clean mLaunchingProviders of all providers started by the client
2012-09-05 12:36:04 -07:00
Dmitry Shmidt
8de24dca68
Restore original default Wifi sleep policy (always)
...
BUG: b/7092819
Change-Id: I6ee6755fd04df2f0169f8602e60542c3591038f3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-09-05 12:35:09 -07:00
Jim Miller
f73fbf79a1
Don't depend on LockPatternUtils to get DevicePolicyManager
...
This fixes a crash where LockPatternUtils hasn't been set yet and
keyguard attempts to get the device policy for widgets.
This change breaks the dependency by getting a handle to DPM directly.
Bug:7109723
Change-Id: Iecae91474358821ebd30456648377253864c35cf
2012-09-05 12:23:06 -07:00
Jean-Baptiste Queru
f389f2820c
resolved conflicts for merge of 7749a1c5 to jb-mr1-dev
...
Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
2012-09-05 12:21:50 -07:00
Jean-Baptiste Queru
342c6bc8e5
am 54099555: am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
...
* commit '540995555505486074e9652a9c682bdf6e3056c5':
Am: Clean mLaunchingProviders of all providers started by the client
2012-09-05 12:12:56 -07:00
Jean-Baptiste Queru
7749a1c5ec
am b4ac801c: am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
...
* commit 'b4ac801c477c0a0de18da89744d9a78e79d2ff51':
Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:12:52 -07:00
Jean-Baptiste Queru
5409955555
am 380a8e3d: Merge "Am: Clean mLaunchingProviders of all providers started by the client"
...
* commit '380a8e3d126374b0205e8452bf2b4b70779e2606':
Am: Clean mLaunchingProviders of all providers started by the client
2012-09-05 12:10:48 -07:00
Jean-Baptiste Queru
b4ac801c47
am 1ca2fee9: Merge "Make default value of auto-sync in SyncStorageEngine configurable"
...
* commit '1ca2fee9547dbdd7008211ac318b1f8f40ce1e35':
Make default value of auto-sync in SyncStorageEngine configurable
2012-09-05 12:10:44 -07:00
Fabrice Di Meglio
5575e97cea
Merge "Fix bug #7023040 android.widget.cts.TextViewTest#testResetTextAlignment failures" into jb-mr1-dev
2012-09-05 12:03:32 -07:00
Scott Main
f53c571144
am b693f6a9: am 8f58d381: older not lower
...
* commit 'b693f6a94ca2fa6bd4bba94363112bfd1aeb70ee':
older not lower
2012-09-05 12:01:14 -07:00
Scott Main
b693f6a94c
am 8f58d381: older not lower
...
* commit '8f58d38103bd3ddc68c2b226e80b9f4c60529dae':
older not lower
2012-09-05 11:58:55 -07:00
Scott Main
e8c47a88dc
am 3bcf81df: am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev
...
* commit '3bcf81dfa44a4a583f5c7345849349974e5e121c':
docs: Accessibility DevGuide, Jelly Bean edition
2012-09-05 11:55:17 -07:00
Scott Main
8f58d38103
older not lower
...
Change-Id: Idd925213af834d138991fc6237cfe0329f73ad67
2012-09-05 11:54:05 -07:00
Selim Gurun
d773ca8ff2
remove defunct javascript interface
...
Bug: 7073422
The feature that is using search box implementation was removed from
browser after Honeycomb. This is to remove the js interface that
is added for this feature.
Change-Id: I9441d461caf189467e4ad45de958c13b81f4ff17
2012-09-05 11:53:44 -07:00
Scott Main
3827d4327e
am 5ba48e12: am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev
...
* commit '5ba48e12d35c103632d435159c04bb377005c300':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
2012-09-05 11:53:37 -07:00
Scott Main
3bcf81dfa4
am 253483dd: Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev
...
* commit '253483dd974302f0d286eacf6f0f8a9ac9258f78':
docs: Accessibility DevGuide, Jelly Bean edition
2012-09-05 11:52:57 -07:00
Scott Main
5ba48e12d3
am d4107dca: Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev
...
* commit 'd4107dca294a2e719b6ba3a268b7147d7cc2922f':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
2012-09-05 11:51:21 -07:00
Scott Main
253483dd97
Merge "docs: Accessibility DevGuide, Jelly Bean edition" into jb-dev
2012-09-05 11:50:18 -07:00
Scott Main
d4107dca29
Merge "dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts" into jb-dev
2012-09-05 11:48:56 -07:00
Jean-Baptiste Queru
380a8e3d12
Merge "Am: Clean mLaunchingProviders of all providers started by the client"
2012-09-05 11:40:30 -07:00
Joe Fernandez
ba4cf3c850
docs: Accessibility DevGuide, Jelly Bean edition
...
Change-Id: Idafa0d755c0397b539a6de5b10096abc1c06c2c7
2012-09-05 11:27:48 -07:00
Jean-Baptiste Queru
0b5a4a1513
am 11626a91: am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
...
* commit '11626a91b6e695e7a8fa9e9a9f1a37df11cfb4e2':
Revert "Watchdog: Improvement of debuggability"
2012-09-05 11:07:21 -07:00
Jean-Baptiste Queru
11626a91b6
am 9eb3bd88: am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
...
* commit '9eb3bd88f14c386c89dd2576c3ca798f2493b0fd':
Revert "Watchdog: Improvement of debuggability"
2012-09-05 11:04:53 -07:00
Jean-Baptiste Queru
1ca2fee954
Merge "Make default value of auto-sync in SyncStorageEngine configurable"
2012-09-05 11:03:13 -07:00
Jean-Baptiste Queru
9eb3bd88f1
am 42a58ecd: Merge "Revert "Watchdog: Improvement of debuggability""
...
* commit '42a58ecd27783d347242206bcffd4052cf1d5164':
Revert "Watchdog: Improvement of debuggability"
2012-09-05 11:01:25 -07:00
Jean-Baptiste Queru
42a58ecd27
Merge "Revert "Watchdog: Improvement of debuggability""
2012-09-05 10:55:43 -07:00
Romain Guy
4a332f5bae
Merge "Don't invalidate all the glyphs when flushing large textures" into jb-mr1-dev
2012-09-05 10:41:39 -07:00
Scott Main
395b3936b8
dashboard update for 9/4
...
switch to simplified pie charts: codenames for platforms and separate size and density charts
Change-Id: I9b54f19f6a0c66645b4790e090afef4ec70555b0
2012-09-05 09:34:08 -07:00
Daniel Sandler
5a426f6c4a
Merge "Full-height panels on phones." into jb-mr1-dev
2012-09-05 09:33:50 -07:00
Daniel Sandler
bf526d14f3
Full-height panels on phones.
...
The dynamic carrier label is also back for those devices.
Finally, allow the panel to be dragged just by touching the
(newly reopened) empty area.
Bug: 6999596
Change-Id: I65f2867f1bd1977270de0bcedd32cb7141fcb6b1
2012-09-05 10:36:02 -04:00
Daniel Sandler
256a1b4dac
Merge "The default notification LED color is now white." into jb-mr1-dev
2012-09-05 05:45:51 -07:00
Michael Jurka
78770167ce
Merge "Fixing preloading recents for all devices" into jb-mr1-dev
2012-09-05 05:45:51 -07:00
Daniel Sandler
c9ce0abe29
Make the SystemUI stop the screen saver when a full-screen notification is posted.
...
This keeps all the fullScreenIntent logic (including
multiuser implications) in one place.
Change-Id: I4ef284daf90464f105780ade1d971e9e081fbbb5
2012-09-05 08:41:07 -04:00
Daniel Sandler
24518e466a
Do not play sounds or vibes for background users' notifications.
...
USER_ALL notifications will still play/vibe for any user.
Change-Id: Ie8cc69bd1541193ed9c4207ef38a8d4898af0a9d
2012-09-05 08:41:07 -04:00
Michael Jurka
d0d4bb8459
Fixing preloading recents for all devices
...
- Fixed for tablets and phones with hard nav buttons
Change-Id: I1dc2249376b3f376c283598f5cef6e326b191ace
2012-09-05 05:39:16 -07:00
Michael Jurka
881f0b1ee0
Remove unneeded imports
2012-09-05 04:44:59 -07:00
Michael Jurka
8481980495
Merge "Porting old code for min alpha for items in recents" into jb-mr1-dev
2012-09-05 03:40:15 -07:00
Michael Jurka
a1730fa4f1
Merge "Debug code for window transition crash" into jb-mr1-dev
2012-09-05 03:09:11 -07:00
Brian Muramatsu
580e9f72e0
Merge "Make battery shutdown temperature configurable" into jb-mr1-dev
2012-09-04 22:48:36 -07:00
Mathias Agopian
f87633f38c
Merge "update to new SurfaceComposerClient API" into jb-mr1-dev
2012-09-04 20:30:02 -07:00
Satoshi Kataoka
0d727c714b
Merge "Add subtypeId for keeping enabled "InputMethodSubtype"s even if subtype parameters are changed" into jb-mr1-dev
2012-09-04 20:27:50 -07:00