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

139333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
George Mount
426a768974 Merge "Make more descriptive exception for null viewName." 2014-06-10 22:12:51 +00:00
George Mount
d5f9d735b7 Make more descriptive exception for null viewName. 
Bug 15114583

Change-Id: I73db179e032947843e3f9a7f1cc5228cbf6fc22b
 2014-06-11 13:00:11 -07:00
George Mount
e089d06151 Merge "Allow enter activity transitions to be delayed until data is ready." 2014-06-10 22:06:31 +00:00
George Mount
8c2614ce43 Allow enter activity transitions to be delayed until data is ready. 
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
 2014-06-10 17:03:43 -07:00
destradaa
45c9ef2021 Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp." 2014-06-10 21:44:22 +00:00
destradaa
d5323174d8 Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp. 
Change-Id: I6c15665118d52627978381935716436981a058d1
 2014-06-12 11:47:05 -07:00
Robert Greenwalt
65599da861 Merge "Fix build" 2014-06-12 05:34:42 +00:00
Wei Wang
53fe28b7b6 LE: Add oneway attribute to Gatt callbacks 
Adding the 'oneway' attribute to the GattService interface definition
prevents applications from blocking callbacks.

Bug: 15489651
Change-Id: Id7fcf7f95539092f03e5773ca318b5472b55cb4d
 2014-06-12 23:48:41 +00:00
Robert Greenwalt
e595b97ff4 Fix build 
Re-finalizing some classes.  The api/current.txt was updated separately but the change
that made them final got skipped.  Also had same issue for some @hide's that were removed.

Change-Id: I423bb7b3029ee03425a3c446bda51ab8191887c1
 2014-06-12 16:24:38 -07:00
Jae Seo
796691e302 Merge "Add an API to get TV input icon" 2014-06-12 03:30:50 +00:00
Nick Kralevich
659e0e1d94 am 50ece5ec: am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '50ece5ec53661a51ce5a15f782fdcd747171bc02':
  Add service_contexts to policy update bundles.
 2014-06-12 21:16:51 +00:00
Jaewan Kim
cca74c1b0d Add an API to get TV input icon 
Bug: 14423022
Change-Id: I7b3c0efadc8448cae56ef370611be8e09a301f42
 2014-06-12 10:36:00 +00:00
Alan Viverette
04b8e270f2 Merge "Make overlapAnchor public, make ActionBar spinner overlap" 2014-06-12 05:34:42 +00:00
Alan Viverette
e178c93ff5 Make overlapAnchor public, make ActionBar spinner overlap 
BUG: 15566102
Change-Id: I23885c2d66ce0749e4c131491205bb8eb2612923
 2014-06-12 13:23:20 -07:00
Svetoslav
3d187c2e9f Merge "Fix backwards compatibility for introspected windows." 2014-06-11 21:23:31 +00:00
Svetoslav
f7174e87b6 Fix backwards compatibility for introspected windows. 
1. The APIs for introspecting interactive windows were reporting only
   the touchable windows but were missing the focused window. The user
   can interact with the latter by typing, hence it should always be
   reported. Also this was breaking backwards compatibility as if the
   focused window is covered by a modal one, the focused window was not
   reporeted and this was putting the active window in a bad state as
   the latter is either the focused window or the one the user is touching.

2. Window change events are too frequent as on window transition things
   are chanign a lot. Now we are trottling the windows changed events
   at the standard recurring accessibility event interval.

3. Fixed a wrong flag comparison and removed some unneded code.

buy:15434666
bug:15432989

Change-Id: I825b33067e8cbf26396a4d38642bde4907b6427a
 2014-06-12 12:11:39 -07:00
Winson Chung
582e2731b4 Merge "Fix regression in using visibility flags. " 2014-06-12 03:30:50 +00:00
Jason Monk
4e81913a66 Merge "Allow device owner to configure secondary users" 2014-06-12 17:09:07 +00:00
Jason Monk
03978a40b3 Allow device owner to configure secondary users 
Currently the device owner can create secondary users, but unless
it is a system app it will not be installed and will not be able
to pass data easily from the code that creates the user and any
code running on that user.

This allows the device owner to install itself while creating a
user and start up a service to configure that user.  createUser
takes an bundle so that the device owner can pass across any
initial setup data it needs to, this bundle will be sent to
the admin receiver in onEnable.

Change-Id: Ic1f8565dd2a7bd85363527cf68b0ecd4dc9c3636
 2014-06-12 16:30:00 -04:00