drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,354 Commits 1 Branch 0 Tags
Commit Graph

139354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
e4ad633a36 Merge "Some tweaks to improve document task creation." into lmp-preview-dev 2014-06-10 22:06:31 +00:00
Dianne Hackborn
d38aed8142 Some tweaks to improve document task creation. 
- Mark the chooser activity as never launching in to a new
  task, even if the caller asks for it.  These are dialogs
  so don't make sense as stand-alone tasks.  (Maybe later
  the policy should be to not launch into a new task in any
  case that the activity is a dialog or even transparent at all.)

- Keep track in the task record of whether any activities in
  it have been shown to the user, and use this to automatically
  remove the task when all activities finish.  This leans up
  cases where apps are launching stub activities that get turned
  in to tasks but are never seen by the user because they
  immediately launch another activity in another task and
  then finish.

Change-Id: I00b641c80aa96bd5071479f36ee2e4d8e3a81aeb
 2014-06-10 21:49:48 -07:00
Winson Chung
6f6f273df6 Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev 2014-06-10 22:00:10 +00:00
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +00:00
Robert Greenwalt
78802575ac Merge "Add a new IpPrefix class and use it in RouteInfo." 2014-06-10 22:12:51 +00:00
Selim Gurun
1ac3e017d4 Merge "Add WebChromeClient.showFileChooser" 2014-06-10 22:13:32 +00:00
Elliott Hughes
1a3908e959 Merge "Switch to a type-safe album art interface." 2014-06-10 21:55:12 +00:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface. 
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
 2014-06-11 14:43:57 -07:00
Deepanshu Gupta
92b7c67e71 Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 2014-06-10 21:55:02 +00:00
Deepanshu Gupta
9c80488e11 LayoutLib fixes for API 20 [DO NOT MERGE] 
Fixes a bunch of issues with delegate method signatures.

Also cherrypicked commit 664d6f1fe4d6dfa742b3e98051f924dbc190f8ca
which is needed in this branch also.

Bug: 15492736
Change-Id: If99ff279b0d0cabe22942da27388ecb4b800c330
 2014-06-12 19:48:38 +00:00
John Reck
de233aec5a Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev 2014-06-10 21:55:02 +00:00
John Reck
c60676624c DO NOT MERGE Disable AtlasInitializer 
Bug: 15425820

Change-Id: I15270eb7a5856523625e2de48ef9efc2520ddb0f
 2014-06-11 15:53:53 +00:00
Lorenzo Colitti
7dc78cf3af 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
 2014-06-10 14:46:39 -07:00
Jeff Brown
34c6b86470 Merge "Revert "Add support for setTint in all Drawables, clean up lint warnings"" 2014-06-10 21:44:22 +00:00
Jeff Brown
cda212d79d Revert "Add support for setTint in all Drawables, clean up lint warnings" 
This reverts commit 381f83b613f7b6e71180983dbb992ff62f8dd6e3.

Change-Id: I1181f436c647216ac46162260d9d886197b24568
 2014-06-14 02:16:41 +00:00
Alan Viverette
4b17118aca Add support for setTint in all Drawables, clean up lint warnings 
Change-Id: Ia38b9d3e9d5c0072382050e815bdd9232b672e50
 2014-06-13 16:18:11 -07:00
Zhijun He
5eaf6d2161 Merge "Camera2: Add timestampCalibration tag" 2014-06-13 21:09:46 +00:00
Zhijun He
45fa43a181 Camera2: Add timestampCalibration tag 
Also update the video/optical stabilization docs.

Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14
 2014-06-13 18:29:37 -07:00
Vinod Krishnan
2743b05efe am 61eb51b8: (-s ours) am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev 
* commit '61eb51b8f5fb9d747ce5e06c0799f81ff8ddac16':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
 2014-06-14 01:17:53 +00:00
smain@google.com
9b99a971f6 am b06efc72: am aa1ecf5c: html cleanup. delete quickviews 
* commit 'b06efc724cdf571342f5d1ebc9ff075624d4aebd':
  html cleanup. delete quickviews
 2014-06-14 01:17:43 +00:00
smain@google.com
2ff0e5ce49 am 80b69dc2: am b43eff80: adjust scroll position now that there\'s secondary nav bar 
* commit '80b69dc2035711208791d7253bca04eb29eacb68':
  adjust scroll position now that there's secondary nav bar
 2014-06-14 01:17:31 +00:00
Craig Mautner
bbca40a069 am 916cd977: (-s ours) am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly."" 
* commit '916cd9770ce865bad98f15a68be74f3aa607e727':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
 2014-06-14 01:17:17 +00:00
Alan Viverette
71320072e1 am f1d382b3: (-s ours) DO NOT MERGE Fix bright foreground & hint colors 
* commit 'f1d382b3c190966c8034fe6a6ae71e145a348b83':
  DO NOT MERGE Fix bright foreground & hint colors
 2014-06-14 01:04:39 +00:00
Craig Mautner
c7e0a4b23d am 40190375: am 6fe2184b: Do not treat the dummy animation as an animation 
* commit '40190375408034b2b7dd1aef358086da2914051b':
  Do not treat the dummy animation as an animation
 2014-06-14 00:58:00 +00:00
Alan Viverette
a35064931f DO NOT MERGE Fix bright foreground & hint colors 
BUG: 15616463
Change-Id: I747a3fd30e701bd2ee40df5faf2688cd5af4ee14
(cherry picked from commit cf8b6f0610868a59fd8777d8aa3c865facc73e5b)
 2014-06-13 22:59:02 +00:00
smain@google.com
b936130caf Merge "resolved conflicts for merge of 122ee7e8 to master" 2014-06-11 08:41:11 +00:00
smain@google.com
7250cf4e7c resolved conflicts for merge of 122ee7e8 to master 
Change-Id: I6224605fd05dcfe1d5f351a01bc411c6855d0e52
 2014-06-13 17:54:26 -07:00
Craig Mautner
3a040c1b18 Merge "Revert "Revert "Close ActivityView and ActivityContainer cleanly.""" 2014-06-13 21:09:46 +00:00
Craig Mautner
d163e75189 Revert "Revert "Close ActivityView and ActivityContainer cleanly."" 
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.

Change-Id: I7bac1aa1d96fa7922cc835949730a26204f15f2f
 2014-06-13 17:39:35 -07:00
Craig Mautner
bc2a6dff1f Do not treat the dummy animation as an animation 
The dummy animation is a place holder. When the task stack is being
removed treating it as a true animation forced us through a path
where we deferred the detachment and made a call to tmpRemoveWindows.

Also replaced call to tmpRemoveWindows with a real remove windows
call. The tmpRemoveWindows call does not clean up the Session
and this leaves a surface on the screen.

Fixes bug 15591610.

Change-Id: I05f7bc276bfed2366bbcd8443c92a4bbbc8a4491
 2014-06-13 17:33:15 -07:00
Winson Chung
42617c3773 Merge "Cleaning up some old animation code, only setting view properties that have changed." 2014-06-13 21:09:46 +00:00
Winson Chung
b5ddfc3756 Cleaning up some old animation code, only setting view properties that have changed. 
- Also drawing a background on the thumbnails if a transparent thumbnail is detected.

Change-Id: I3f5450d207ae0796150c8b04aabc2f910f80e0a7
 2014-06-14 00:39:28 +00:00
Alan Viverette
9de1874323 Merge "Add support for setTint in all Drawables, clean up lint warnings" 2014-06-12 03:30:50 +00:00
George Mount
530ae0a5ec Merge "Allow customization of background fade duration." 2014-06-10 21:44:22 +00:00
Anil Muthineni
5d3c5fc115 Add api to inject SMS PDUs 
Change-Id: I58a518a7a6d6f43fef3d989bc0c8b21959404ed0
 2014-06-12 17:44:22 +00:00
George Mount
ed1e01d7e4 Allow customization of background fade duration. 
Bug 15195468

Change-Id: I02c1ef446cfa8aaedce640ab5694b6d9245bb9f7
 2014-06-12 10:33:53 -07:00
Prerepa Viswanadham
9ad537d7db Merge "Take out startScanWithUuidScanParam as part of refactoring" 2014-06-12 17:09:07 +00:00
Prerepa Viswanadham
58a01d6ab1 Take out startScanWithUuidScanParam as part of refactoring 
Change-Id: Icfb9083571e22c0853fc64ad4d09a20cbf754257
 2014-06-12 10:39:29 -07:00
Jeff Brown
98908aa0c9 Merge "Add call to set power mode for display" 2014-06-12 17:09:07 +00:00
Vinit Deshpande
daf215cf95 Support scanning using band specification instead of channels 
This change enables scanning with band specification instead of channels,
this should ease app development.

Also includes a bug fix for parcel serialization/deserialization.

Change-Id: Idbffce4805b403bf8fe1efae999cb828e09c2420
 2014-06-12 08:34:44 -07:00
Vinit Deshpande
e344cb2268 Fix an NPE in WifiScanner while reporting description 
Change-Id: Ie9d12e19e0b8ca98c6ec4c6fa5222a2f28983e64
 2014-06-12 08:34:44 -07:00
Yuhao Zheng
0811cbee48 Merge "Wifi passpoint - linking APIs" 2014-06-12 03:30:50 +00:00
Chris Craik
3e136626da am 69453787: Merge "Fix race in shadow tessellation by deep copying task params" into lmp-preview-dev 
* commit '6945378752381a04d81eb426876a6495488cd459':
  Fix race in shadow tessellation by deep copying task params
 2014-06-12 16:54:18 +00:00
Dianne Hackborn
eebf7b954e am 0324f4b6: Merge "Fix calling startConfirmation instead of startCommand." into lmp-preview-dev 
* commit '0324f4b651e2e02319c580c16aee8d815a9beb24':
  Fix calling startConfirmation instead of startCommand.
 2014-06-12 16:54:09 +00:00
Selim Cinek
c45d5d2aa4 am 0984a93c: Changed the visual appearance of the speedbump view. 
* commit '0984a93c5df33cc044a86e04e6dbe68d58027352':
  Changed the visual appearance of the speedbump view.
 2014-06-12 16:54:03 +00:00
Eino-Ville Talvala
bb373e601f am e941070b: Merge "Camera2: Misc + enum value documentation updates" into lmp-preview-dev 
* commit 'e941070bd7ab910b558bbace38e2ff813fa0327c':
  Camera2: Misc + enum value documentation updates
 2014-06-12 16:53:54 +00:00
Robert Greenwalt
1a6116922f am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev 
* commit 'fe5ca9646f86e041ed7729ecd0a006428806acf2':
  Fix public API of LinkProperties.
 2014-06-12 16:53:43 +00:00
Yuhao Zheng
ef9ef71a77 Wifi passpoint - linking APIs 
cherry-pick from kwd:

99d4cc Wifi Passpoint - linking credential match API
https://partner-android-review.googlesource.com/#/c/59247/

b5f5ef Wifi Passpoint - linking OSU API
https://partner-android-review.googlesource.com/#/c/59282/
 2014-06-11 15:38:55 -07:00
George Mount
4a7c3af299 Merge "Prevent transitions from calling createAnimator for invalid views." 2014-06-10 22:18:15 +00:00
George Mount
208dcade93 Prevent transitions from calling createAnimator for invalid views. 
Bug 15285527

When two transitions affect different views, createAnimator is
on all Transitions for all views. This CL prevents createAnimator
from being called for Transitions that don't target a view.

Change-Id: I3f70a13b4ea38ad4a9b4724db438b40f6e80eafb
 2014-06-11 13:14:32 -07:00