136762 Commits

Author SHA1 Message Date
Adam Powell
8d1de048d7 Merge "Remove default toolbar content inset for action bars" into lmp-preview-dev 2014-05-29 20:48:52 +00:00
Dongwon Kang
ec80df818f Merge "Fix a typo on TvContract." into lmp-preview-dev 2014-05-29 20:23:53 +00:00
Adam Powell
11223ffd37 Remove default toolbar content inset for action bars
While this may still be a good idea in the long run, it has a number
of negative effects on the layout for activities that never plan to
use a navigation button. Needs further consideration with UX.

Change-Id: If418e6124601f3978fa169ac9c9f48fc39409fec
2014-05-29 12:39:10 -07:00
Adam Powell
2fd1d454b8 Merge "Fix for setting Toolbar content descriptions" into lmp-preview-dev 2014-05-29 19:23:48 +00:00
Adam Powell
8e5372fe93 Fix for setting Toolbar content descriptions
Allow resid 0 as a null content description.

Change-Id: I0663feac229a77d5efffece2bd686de4ee99d840
2014-05-29 12:16:09 -07:00
Paul Jensen
f0db8b622b Merge "Implement bind-to-network functionality of android.net.Network." into lmp-preview-dev 2014-05-29 19:15:29 +00:00
Paul Jensen
2d6f265d00 Implement bind-to-network functionality of android.net.Network.
This is implemented by calling through to netd_client.
Included are functions to bind-to-network-for-process strictly for DNS to
facilitate startUsingNetworkFeature() reimplementation.

bug: 13885501

Change-Id: Ib22c7d02ea81d251bdfeeb0f64a47ce32eefcb1b
(cherry picked from commit dbf76f898f1f57eb74722358087c926d2f529bda)
2014-05-29 18:53:57 +00:00
Yin-Chia Yeh
789de110c7 Merge "Camera2: Test null TonemapCurve behavior" into lmp-preview-dev 2014-05-29 18:42:15 +00:00
Craig Mautner
c7b1b7aeec Merge "implement keyguardGoingAway() fixes build." into lmp-preview-dev 2014-05-29 18:32:41 +00:00
George Mount
eb61eb786a Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev 2014-05-29 18:14:48 +00:00
Craig Mautner
8bd94d502d implement keyguardGoingAway() fixes build.
Fix bug 15326529.

Change-Id: I9095fe70721bfb031dd1080da1d61ff4e1a8c8ab
2014-05-29 10:53:46 -07:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
2014-05-29 16:50:59 +00:00
Craig Mautner
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +00:00
Dongwon Kang
f95b1d8d53 Fix a typo on TvContract.
Change-Id: I2558f4d463653c7e35de7dccb60189ee9eb0a307
2014-05-29 09:40:11 -07:00
George Mount
c93ca16173 Moved shared element motion to be in called Activity.
Bug 15198605

Change-Id: I07ce4f3366dbdc6957d789f724e49d260fe34faf
2014-05-29 09:36:03 -07:00
Paul Lawrence
575510c48f Merge "DO NOT MERGE: Hide crypto consts from docs" into lmp-preview-dev 2014-05-29 16:07:27 +00:00
Paul Lawrence
fab7cbc9ce DO NOT MERGE: Hide crypto consts from docs
@bug 15192967

Change-Id: I134b2cb2d2841bc101e63a8a4dbd86f7b7bdca14
(cherry picked from commit 81ab14fb19a2669aa54c1a333c807c22d5c41a8e)
2014-05-29 16:03:43 +00:00
Dan Sandler
5ec96a201e Merge "Use DecorToolbar.getViewGroup() to get the view properly." into lmp-preview-dev 2014-05-29 15:53:03 +00:00
Deepanshu Gupta
85c69944bd Merge "Recurse into directories to find fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:38:17 +00:00
Deepanshu Gupta
f251b06089 Merge "Parallel processing of the fonts. [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:55 +00:00
Deepanshu Gupta
28b13b2332 Merge "Add multiple dir support to build_font.py [DO NOT MERGE]" into lmp-preview-dev 2014-05-29 15:37:45 +00:00
Deepanshu Gupta
2cb50d45a8 Merge "Layoutlib: Fix FontFamily_Delegate use after unref" into lmp-preview-dev 2014-05-29 15:37:24 +00:00
Deepanshu Gupta
1a5b0de877 Merge "Update delegates" into lmp-preview-dev 2014-05-29 15:37:07 +00:00
Griff Hazen
6326ef4dd5 Merge "DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender" into lmp-preview-dev 2014-05-29 15:17:26 +00:00
Robert Greenwalt
33051471cf Merge "Don't break things if a network goes back to CONNECTED." into lmp-preview-dev 2014-05-29 15:15:14 +00:00
Dan Sandler
6fdeeb34ae Use DecorToolbar.getViewGroup() to get the view properly.
Bug: 15320825
Change-Id: Ib7e162c816fadf2b5c83af1326e7158f6bd69c8e
2014-05-29 11:02:41 -04:00
John Spurlock
f71205c1ee VolumeZen: Don't clear stream type if embedded.
Clearing the stream type makes sense if the volume panel is
in dialog mode, but not when embedded.

Bug:15186070
Change-Id: Ice5f547ef987e28ef51050faef682c5dfa5f7604
2014-05-29 10:19:14 -04:00
John Spurlock
2684d5e7d7 QuickSettings: Basic content-resizing for detail panel.
Also remove toggle from zen tile + fix bottom padding.

Bug:15315490
Change-Id: Ib839b9280ce60d2f51e4c0c46e41a7743e7ec8f6
2014-05-29 08:49:41 -04:00
Lorenzo Colitti
bce0106c41 Don't break things if a network goes back to CONNECTED.
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052

(cherry picked from commit cfff026ec47afc7e31f60f80e3deea7f4e2f9be5)

Change-Id: I52c2220e8f1d98fca765880be3040593e92722ed
2014-05-29 21:36:07 +09:00
Griff Hazen
ca48d35423 DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
2014-05-28 22:37:13 -07:00
Xavier Ducrohet
7ee26070ea Merge "Stopgap fix for layoutlib." into lmp-preview-dev 2014-05-29 05:27:32 +00:00
Brian Carlstrom
312da405eb Tracking ActionBarView change 1181f77bdfaa7bf8a8250cdd13c7b7a1d6ee0c44
Change-Id: I29a486557428806f26f900974e74f42f3afa4ad4
2014-05-28 21:43:35 -07:00
Brian Carlstrom
8c9360f3aa Tracking IWindowManager change 2ea3814083f27567ae07a1b449da3d596dd4d9d5
Change-Id: I6945cc9b4be174b55173ac2081edc5ee1bee6e67
2014-05-28 21:37:52 -07:00
Christopher Tate
2ddbbe7b94 Merge "Widget restore documentation tweaks" into lmp-preview-dev 2014-05-29 01:27:51 +00:00
Christopher Tate
c04e9aa916 Widget restore documentation tweaks
- Fix broken Javadoc @see directives
- Linkify AppWidgetProvider in the documentation for the new
  ACTION_APPWIDGET_RESTORED broadcast
- Minor content edits

Bug 15022842

Change-Id: Ia7d4ad5be476c260492e1be5d83e21f6943a6847
2014-05-28 17:56:53 -07:00
Selim Cinek
fb816fc701 Merge "Fixed a bug where the user was unable to pull down statusbar." into lmp-preview-dev 2014-05-29 00:20:33 +00:00
Dianne Hackborn
a923758d80 Merge "Add system layer for voice interaction services." into lmp-preview-dev 2014-05-29 00:18:25 +00:00
Dianne Hackborn
e30e02f5d9 Add system layer for voice interaction services.
New window layer that voice interaction service windows
go in to.  Includes a new voice-specific content rectangle
that voice activities are placed in to.

Add specific animations for this layer, sliding down from
the top (though this can be customized by the voice interaction
service).

Also add the concept of activities running for voice interaction
services for purposes of adjusting the animation used for them,
again sliding from the top, but not (yet?) customizable by the
voice interaction service.

Change-Id: Ic9e0e8c843c2e2972d6abb4087dce0019326155d
2014-05-28 17:16:51 -07:00
Selim Cinek
3c4635c199 Fixed a bug where the user was unable to pull down statusbar.
When going to the phone or camera from the lockscreen, touches
where blocked and the statusbar could not be pulled down anymore.

Bug: 15308821
Bug: 15126905
Change-Id: Ic9563346f6a466cb5ada3f4af518fabcd650e9b9
2014-05-29 02:12:47 +02:00
Deepanshu Gupta
dc62340f18 Stopgap fix for layoutlib.
This is a temporary fix for changes made to TypedArray regrading theme
attributes.

Change-Id: I173fde6d8d3259479b0654ff331bc27bf2814fb0
2014-05-28 16:52:01 -07:00
Christoph Studer
3326a8782f Merge "SysUI: Fix bug where ZEN notification icon was shown" into lmp-preview-dev 2014-05-28 23:40:02 +00:00
Christopher Tate
56f2daab14 Merge "Don't crash on boot" into lmp-preview-dev 2014-05-28 23:37:30 +00:00
Christopher Tate
f889ed11d2 Don't crash on boot
...when removing dangling preferred-activity entries.

Bug 15310848

Change-Id: Ibe9d82a06f8c608b866a2c3c6b286da2ededacca
2014-05-28 16:31:58 -07:00
Chris Craik
c1073c3376 Merge "Make ViewPropertyAnimator correctly damage shadow receivers" into lmp-preview-dev 2014-05-28 23:16:14 +00:00
Deepanshu Gupta
9113968f95 Layoutlib: Fix FontFamily_Delegate use after unref
FontFamily_Delegate was being reused after the nUnref call. The issue is
fixed by storing the reference to the FontFamily_Delegate directly in
the Typeface_Delegate rather than storing the native pointer.

Change-Id: I0db724a83c4be3d7b64ccba0989cd64129f2a785
2014-05-28 16:15:32 -07:00
Chris Craik
b8a0913471 Merge "Respect Z ordering in touch dispatch, software drawing" into lmp-preview-dev 2014-05-28 23:12:57 +00:00
John Spurlock
1fc422bd7d Merge "QuickSettings: Bind notifications tile to the ringer stream." into lmp-preview-dev 2014-05-28 23:11:59 +00:00
John Spurlock
420d33b797 QuickSettings: Bind notifications tile to the ringer stream.
So it has the same logic as the dialog version.  The streams
are bound together.

Bug:15314453
Change-Id: Icc8e5f359948b60c52616709cd34a48e108b96cd
2014-05-28 19:10:41 -04:00
Zhijun He
f5fe63c35c Merge "Camera2: Update spec for thumbnail cropping behavior" into lmp-preview-dev 2014-05-28 22:49:31 +00:00