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

139207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ztenghui
9c68b42dc4 Merge "Add AnimatedVectorDrawable" 2014-06-12 03:30:50 +00:00
ztenghui
e5e92602a4 Add AnimatedVectorDrawable 
Currently as a hidden class.
It can support many the animations now as far as ObjectAnimator and
hierarchical group can support.
And we don't have path morphing yet.

Also support the Animator / Interpolator inflation from Context and Resources.

Change-Id: I948bbdf7373ad291171eed0b497959dce8c2edf3
 2014-06-12 13:18:59 -07:00
Winson Chung
cadc7a200a Merge "Exploring transitions to/from Recents." 2014-06-12 05:34:42 +00:00
Amith Yamasani
db6cf3a768 Merge "Guest user first iteration" 2014-06-12 03:30:50 +00:00
Deepanshu Gupta
7f2cd8df47 am 1434ea74: (-s ours) am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 
* commit '1434ea749f669b09aff3f7a98859d2593da32f61':
  LayoutLib fixes for API 20 [DO NOT MERGE]
 2014-06-12 20:08:13 +00:00
Adrian Roos
d0406a45e2 am 92140c92: Merge "Update PhoneWindow to new window inset dispatching" into lmp-preview-dev 
* commit '92140c925ab4a142798f9b1acd6efe506d1f55e3':
  Update PhoneWindow to new window inset dispatching
 2014-06-12 20:06:09 +00:00
George Mount
005fbda205 am 127ae6e5: Merge "Add reasonable default activity transitions to theme.material.light." into lmp-preview-dev 
* commit '127ae6e5584f8dcc8db4a4faa6bd03272f631f57':
  Add reasonable default activity transitions to theme.material.light.
 2014-06-12 20:06:03 +00:00
Chris Wren
1532feb580 am ec8763a9: Merge "Manage heads up state during notification update." into lmp-preview-dev 
* commit 'ec8763a994a9d08cb40f47fa82f35e75a032e5a5':
  Manage heads up state during notification update.
 2014-06-12 20:05:55 +00:00
Przemyslaw Szczepaniak
baa2c989c5 am 1217cd62: (-s ours) Merge "Hide new TTS API for the lmp-preview. DO NOT MERGE" into lmp-preview-dev 
* commit '1217cd62d373ce9f6dbe1985d4b26db0acda5254':
  Hide new TTS API for the lmp-preview. DO NOT MERGE
 2014-06-12 20:05:50 +00:00
Amith Yamasani
1e9c21871e Guest user first iteration 
Setting for controlling if guest is enabled on the device.
Setting to hint to apps that they should skip showing first use clings.

User switcher handles creation and deletion of the guest user.
Some tweaks to the user switcher to show some feedback and make the icons
circular.

Change-Id: I187dc381d2ee7c372ec6d35e14aa9ea4dfbe5936
 2014-06-12 12:59:47 -07:00
Chris Wren
0fdab2fb43 Merge "Manage heads up state during notification update." into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Chris Wren
d04f6cee5f Manage heads up state during notification update. 
Notifications can now get the heads up slot on updates.
FLAG_ONLY_ALERT_ONCE suppresses this behavior.

Bug: 15534198
Change-Id: Ie27b7c7d93c590d777670c538fb796a04252046f
 2014-06-11 23:53:30 -04:00
Jorim Jaggi
a1adf0db4f Merge "resolved conflicts for merge of 6edef668 to master" 2014-06-11 15:57:38 +00:00
Jorim Jaggi
b41e0e37ec resolved conflicts for merge of 6edef668 to master 
Change-Id: Ia0c79581e9221341718799d2969f56c95a76a3de
 2014-06-12 22:02:32 +02:00
Selim Cinek
5da5e7a481 am 3ee7fb10: Merge "Introduced fading views for the camera interaction on the lockscreen." into lmp-preview-dev 
* commit '3ee7fb1045024b566d852f12ef8f081206ba7bb5':
  Introduced fading views for the camera interaction on the lockscreen.
 2014-06-12 19:58:19 +00:00
Jorim Jaggi
37ab979581 am da787d08: Merge "Material navigation bar." into lmp-preview-dev 
* commit 'da787d08accbddc3ca4fd49d798d11fe3523b1bf':
  Material navigation bar.
 2014-06-12 19:58:13 +00:00
Jean Chalard
11abbdcb78 am 7d8b87f0: Merge "Fix a CTS test" into lmp-preview-dev 
* commit '7d8b87f0d9b35694099d5f57777d27f577496960':
  Fix a CTS test
 2014-06-12 19:58:08 +00:00
Yohei Yukawa
2a97b54f49 am f09cb58d: Merge "Rename CursorAnchorInfoBuilder with Builder" into lmp-preview-dev 
* commit 'f09cb58d5f528665e6e96d8740eeeeab4167e357':
  Rename CursorAnchorInfoBuilder with Builder
 2014-06-12 19:58:02 +00:00
John Spurlock
61d3fab690 am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lmp-preview-dev 
* commit 'e2f6373c80e7d1a5a7c71412bff10a71c54cd451':
  Heads-up notifications for low battery warnings.
 2014-06-12 19:57:56 +00:00
Adam Powell
61c585756c am 13cfcacf: Allow action bar navigation icon resource id of 0 
* commit '13cfcacf2a39b742ed9b0fea25924fc828e8c107':
  Allow action bar navigation icon resource id of 0
 2014-06-12 19:57:50 +00:00
Adam Powell
c78f2f7fea am 22e41e9a: Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev 
* commit '22e41e9add1aeb0c8a79741f587c270752a50d16':
  Enable collapsing empty Toolbar-based ActionBars above tabs
 2014-06-12 19:57:42 +00:00
Chris Craik
5b368b3d9f am 98b10e48: Merge "Limit path approximation recursion depth" into lmp-preview-dev 
* commit '98b10e480279d331e54b9f28546629687244a01c':
  Limit path approximation recursion depth
 2014-06-12 19:57:36 +00:00
Chris Craik
a9b2639cba am b1f0d0b1: (-s ours) Merge "Workaround to avoid polygon flashing DO NOT MERGE" into lmp-preview-dev 
* commit 'b1f0d0b1853b54b6ce5f8f307a3f21845afc2fe2':
  Workaround to avoid polygon flashing DO NOT MERGE
 2014-06-12 19:57:31 +00:00
Robert Greenwalt
756c4b795e am f7c964fa: Merge "Fix Build" into lmp-preview-dev 
* commit 'f7c964fa06257d6db1b894bfbe905ca125c755c8':
  Fix Build
 2014-06-12 19:57:23 +00:00
Alan Viverette
5dcb543199 am 4ea9d069: Merge "Add Settings theme, fix DialogWhenLarge theme" into lmp-preview-dev 
* commit '4ea9d0698df166d30e38db4d16450530eb9c1f38':
  Add Settings theme, fix DialogWhenLarge theme
 2014-06-12 19:57:17 +00:00
Robert Greenwalt
54e312a51b am 9c6d406e: Fix build breakage. 
* commit '9c6d406eb7ab0fce40fb7cd1257714a29d06774c':
  Fix build breakage.
 2014-06-12 19:57:11 +00:00
Robert Greenwalt
1455a0a05a am 67b8af58: Merge "Missed an api update." into lmp-preview-dev 
* commit '67b8af5843f835d3d3124025d63c96b184cc87f5':
  Missed an api update.
 2014-06-12 19:57:05 +00:00
Robert Greenwalt
1ced737cf4 am c7d65d75: Merge "Fix wifi connectivity issues." into lmp-preview-dev 
* commit 'c7d65d759be6cd48a7bbaa4f061b4c4f85424b11':
  Fix wifi connectivity issues.
 2014-06-12 19:56:55 +00:00
Robert Greenwalt
86eb5906c0 am e1f5b5e0: Merge "Minor changes to the LinkAddress API docs." into lmp-preview-dev 
* commit 'e1f5b5e0cd5206e01e1c0e2bd282d421d9951960':
  Minor changes to the LinkAddress API docs.
 2014-06-12 19:56:45 +00:00
Robert Greenwalt
962b987085 am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev 
* commit '4ad1f0d31e4c998aa65344ccb8abb51cf96dd909':
  Add a new IpPrefix class and use it in RouteInfo.
 2014-06-12 19:56:39 +00:00
Scott Main
3a1d38b331 am 91b078c8: am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '91b078c8dcce20d5b04f14f730e35cc0b25b4041':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:23:48 +00:00
Andrew Solovay
ad60891a6e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2014-06-12 18:50:02 +00:00
Andrew Solovay
56dc9a56f8 am d51a5b38: am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'd51a5b389187ad7db3444a74dc75439ff739d7dc':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 18:49:55 +00:00