137467 Commits

Author SHA1 Message Date
Selim Cinek
98751ac6d3 Merge "Introduced fading views for the camera interaction on the lockscreen." into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Selim Cinek
1aed973665 Introduced fading views for the camera interaction on the lockscreen.
Bug: 15126905
Change-Id: I82b0050a4216873d9cd191b32d1e5bf6871acbd6
2014-06-12 03:33:14 +00:00
Jean Chalard
1f3bb8477b Merge "Fix a CTS test" into lmp-preview-dev 2014-06-10 22:29:12 +00:00
Jean Chalard
0a993100f9 Fix a CTS test
SpannableStringBuilder should throw an exception when the
parameters to #insert and related methods are in the wrong
order.
We'll have to reopen b/9570771 and deal with it separately.

Bug: 14965397
Change-Id: I01847e0010d23f98ad3def8ba030d36570528900
2014-06-11 18:03:05 +09:00
Yohei Yukawa
13592c623c Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev 2014-06-10 22:36:02 +00:00
John Spurlock
7baacb177b Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
Adam Powell
6bb10554ba Allow action bar navigation icon resource id of 0
Fix a bug preventing this from being treated properly.

Bug 15458868

Change-Id: Ib1a7def482755757e524dfddd1eb6a02522c5d6b
2014-06-11 19:57:12 -07:00
John Spurlock
3332ba54ae Heads-up notifications for low battery warnings.
Falls back to dialogs when heads-up are N/A.

Add new ongoing notification if battery saver mode
is active.  Offer to start battery saver on warnings,
if not already started.

True up BatteryMeterView's levels to the latest threshold
levels.  15% for first warning.

Bug:13329308
Change-Id: Id8ad11a1997079ee7165ae003a8fa1c744462ab3
2014-06-11 19:38:00 -04:00
Adam Powell
263a2d658b Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Adam Powell
360c1d8922 Enable collapsing empty Toolbar-based ActionBars above tabs
Fixes a regression where Toolbar ActionBars would hold empty space
when previous platform versions would collapse to tabs-only.

Bug 15573337

Change-Id: I6da379d2ed58e8ba8cadcd727606c7fc160ecf91
2014-06-11 19:31:41 -07:00
Chris Craik
0adb6d6e50 Merge "Limit path approximation recursion depth" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Chris Craik
9c3dd62d0f Limit path approximation recursion depth
bug:15369119
Change-Id: I6f009f5e8790129e1aa8a51e1fc6cdd1415dd617
2014-06-11 17:24:51 -07:00
Adam Powell
52769be3ea Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Adam Powell
0d9fdbad75 Explicitly track consumed state for WindowInsets
Treating 0-insets as fully consumed is incorrect since it means that
you can't dispatch empty insets down the view hierarchy - traversal
terminates immediately. Track consumed state independent of actual
values. Replacing a given set of insets with all zeroes will mark it
consumed.

Bug 15341653

Change-Id: I55b33b7dfbf4cae1e906a82140537156cffdbf47
2014-06-11 15:35:51 -07:00
Winson Chung
91b7d2b4fb Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Winson Chung
8175a7c2e6 Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
Change-Id: Ic04dc2ef73c75d63e107e7b50842dd618d3a173a
2014-06-11 14:19:53 -07:00
Christopher Tate
f9fcfaae78 Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Chris Craik
ffdd37ff14 Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Chris Craik
1b3be0877a Fix race in shadow tessellation by deep copying task params
bug:15369119
Change-Id: Ica1445f06693b1cfd038cf3494afe1210d5507c1
2014-06-11 13:49:34 -07:00
Ruben Brunk
937c4dbb1f Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Robert Greenwalt
f5ccb5cc7d Merge "Fix Build" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Robert Greenwalt
6f0ec45a3b Fix Build
Change-Id: Iebbce8eaf21b3d2ba01ec720812d38018b13529e
2014-06-11 18:36:36 -07:00
Robert Greenwalt
130669992c Fix build breakage.
Change-Id: Ideb32704ce5dc37ef36b05609f88da2aa55b3a00
2014-06-11 18:06:55 -07:00
Robert Greenwalt
9468ddee2d Merge "Missed an api update." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
10e049b651 Missed an api update.
Fix build.

Change-Id: I2563ec3c26e1c8dbb9abea9f87537a87ce5fda41
2014-06-11 16:57:03 -07:00
Robert Greenwalt
f09d128517 Merge "Fix wifi connectivity issues." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Sreeram Ramachandran
fb7690d4e1 Fix wifi connectivity issues.
http://ag/480881 changed RouteInfo.getDestination() to return an IpPrefix
instead of a LinkAddress. This makes the equals() comparison always fail.

So, when ConnectivityService.updateRoutes() is given identical routes, instead
of realizing that there's no diff, it would consider them different, and thus
add and remove the same route. The add would fail, since the route already
existed in netd, but the remove would succeed, leaving the system with no routes
and thus no connectivity.

Bug: 15564210
Change-Id: I2003b0fcb809cc20837dc489c58af37891ca4556
2014-06-11 23:02:59 +00:00
Chris Craik
63b4c0d005 Merge "Workaround to avoid polygon flashing DO NOT MERGE" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Chris Craik
6ef8e0178d Workaround to avoid polygon flashing DO NOT MERGE
b/15539571

Temporarily disables caching of tessellation.

Change-Id: If014b8c40664711aef761eec606d28aff1859b14
2014-06-11 19:10:26 -07:00
Dianne Hackborn
34468351ed Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Dianne Hackborn
94d9370142 Fix calling startConfirmation instead of startCommand.
Duh!

Change-Id: Ia9785a1ab37e38b7a044c2d389a1015a209654c9
2014-06-11 13:23:18 -07:00
Selim Cinek
1e119db1a3 Changed the visual appearance of the speedbump view.
The colorfulldots are replaced by a simple line to avoid
catching too much attention.

Bug: 15188625
Change-Id: I41be50dcc61d495f3bc88e4731388f770fda83d0
2014-06-11 19:53:18 +00:00
Eino-Ville Talvala
486ed08899 Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Robert Greenwalt
8fe0d0c84c Merge "Fix public API of LinkProperties." into lmp-preview-dev 2014-06-10 22:18:15 +00:00
Robert Greenwalt
25702b3967 Fix public API of LinkProperties.
bug:15142362
(cherry picked from commit 51d898fd0223a4b7c728980ab987dd985c02df5f)
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-10 15:42:19 -07:00
Eino-Ville Talvala
73b1d94baf Merge "Camera2: Many docs updates" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Alan Viverette
b6b79c134e Merge "Add Settings theme, fix DialogWhenLarge theme" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Alan Viverette
aaf2c8cf7f Add Settings theme, fix DialogWhenLarge theme
Adds dialog background with baked-in shadow. Temporary until we get
window shadow management sorted out.

Change-Id: I2bafed620ac00f8a4e4a17cf19255aaba41858b2
2014-06-11 18:33:33 -07:00
Robert Greenwalt
594b456b6e Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Robert Greenwalt
55213c8022 Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Sreeram Ramachandran
6307b35e1d Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
(cherry picked from commit 7d3b4b9a3d4de9673119632da0ebd583e50126f7)
2014-06-11 16:32:21 -07:00
Robert Greenwalt
6ba62e6416 Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Robert Greenwalt
7569f1811f Make NetworkCapabilities publicly immutable.
Applying API council comments.

bug: 15142362

(cherry picked from commit Ie0bde68b72656a676d90c0343b9756fe9268d8d6)
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
2014-06-11 23:29:39 +00:00
RoboErik
c92856c4bb Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-preview-dev 2014-06-11 23:10:23 +00:00
Lorenzo Colitti
00a0fd650b Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
(cherry picked from commit 9ab53650cfcd91a2a151b44b3fd1381841f76269)
2014-06-11 18:52:19 +00:00
RoboErik
73e23e229d b/15330955 Make RemoteController use the new session APIs
This moves RemoteController over to using Sessions instead of
the RCC/RCD framework. This also adds several hidden APIs to
help with translating between the two apis.

Change-Id: I0f50313db2b6190b16fa86ce670ac9250654ca05
2014-06-11 10:58:52 -07:00
Robert Greenwalt
99d4dd278e Merge "Apply API review to android.net.Network:" into lmp-preview-dev 2014-06-10 22:12:51 +00:00
Paul Jensen
0a363a319f Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit 5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)
2014-06-10 22:26:11 +00:00
Eino-Ville Talvala
e600d6ad60 Camera2: Misc + enum value documentation updates
- Update enum values for many entries
- Reword various sections of documentation for clarity.

Bug: 15475465
Change-Id: I2b03cac8d478e945c7d93717845a9ae44b97639b
2014-06-10 15:12:46 -07:00
Dianne Hackborn
6de057816f Merge "Implement control of auto power save mode." into lmp-preview-dev 2014-06-10 22:06:31 +00:00