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

120638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
b60c1e345c am bf2c4b78: (-s ours) DO NOT MERGE: Don\'t freak out if SystemUiService isn\'t available 
* commit 'bf2c4b788078cf2a2eda0e9f420f4d6225a0774d':
  DO NOT MERGE: Don't freak out if SystemUiService isn't available
 2013-12-05 22:33:43 +00:00
Mike Lockwood
afac09baac am a34f0cd9: (-s ours) DO NOT MERGE: Remove obsolete "headless" support 
* commit 'a34f0cd99c03c345d1dcb91c5038f558cfc1c7f1':
  DO NOT MERGE: Remove obsolete "headless" support
 2013-12-05 22:33:37 +00:00
Ying Wang
41f75016ac am 7a15f932: am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library" 
* commit '7a15f93228b455a731946d4894abdc45be8b164b':
  wifi: Remove obsolete libwpa_client library
 2013-12-05 21:17:08 +00:00
Ying Wang
7a15f93228 am babea8d8: am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library" 
* commit 'babea8d8f2d4b3a40ab4e37646c26783c2288e87':
  wifi: Remove obsolete libwpa_client library
 2013-12-05 20:33:43 +00:00
Ying Wang
babea8d8f2 am 6e2d0c1d: Merge "wifi: Remove obsolete libwpa_client library" 
* commit '6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41':
  wifi: Remove obsolete libwpa_client library
 2013-12-05 12:29:12 -08:00
Alan Viverette
ad7d65daed Merge "Add stacked padding mode to LayerDrawable" 2013-12-05 19:28:27 +00:00
Alan Viverette
a812ab8786 Merge "Allow alert dialogs to inflate custom view layouts" 2013-12-05 19:28:18 +00:00
Ying Wang
6e2d0c1d91 Merge "wifi: Remove obsolete libwpa_client library" 2013-12-05 19:13:20 +00:00
Alan Viverette
5b10a723b0 Add stacked padding mode to LayerDrawable 
General cleanup of LayerDrawable for readability's sake.

BUG: 11695507
Change-Id: Id7811b3c168ef68134d53b93fe9ac36dc9440566
 2013-12-05 11:12:17 -08:00
Alan Viverette
ec186706df Allow alert dialogs to inflate custom view layouts 
Adds APIs to set a layout resource ID as an AlertDialog's custom view. To
make this useful for developers, also ensures that Dialog content is set
up when calls are made to Dialog.findViewById() before show().

BUG: 11136748
Change-Id: I29747a28d7e30f4e31fe474424109ff29e1eaa98
 2013-12-05 11:10:31 -08:00
Dmitry Shmidt
2a69b17309 wifi: Remove obsolete libwpa_client library 
Change-Id: I222c60ec65375768dc62f9219d115b5b09a374f6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-12-05 10:50:48 -08:00
Adam Powell
a93ff445c0 Merge "Add support for cross-activity scenes and transitions" 2013-12-05 18:26:37 +00:00
Adam Powell
3a621bbdc4 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" 2013-12-05 18:06:55 +00:00
Adam Powell
cfbe9be5b3 Add support for cross-activity scenes and transitions 
* Add theme attributes for specifying a top-level TransitionManager
  for an activity window.

* Add window feature for automatic content transitions. This
  automatically assigns/creates a Scene for setContentView calls.

* Add named transitions. This allows apps to define APIs for
  handshake-agreements about which exit/entrance transitions to play.

* Add new transition type for ActivityOptions. This lets the system
  use ActivityOptions to communicate transition specifics and
  arguments to the called activity.

* Have ActivityManager pass appropriate ActivityOptions through to the
  called Activity. Have the called activity call back into the caller
  to let it know which transition of a possible requested set was
  chosen.

Still to do:

* Define and pass arguments for transitions. This will require
  defining a Parcelable version of TransitionValues and deciding how
  much leeway apps should have for these things.

* Determine how to appropriately filter the ActivityOptions bundle so
  that only appropriate data reaches the target.

* Determine if generalizing the auto-Scenes functionality to
  ViewGroups is appropriate.

Change-Id: I10684b926129ab2fbc1adec9ef31767237acae79
 2013-12-05 10:06:19 -08:00
Ying Wang
f254ed9a98 am ceddb389: am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions." 
* commit 'ceddb389b4a1751399a0b1ad3198008011a5397a':
  libcore_to_document and junit_to_document are no longer functions.
 2013-12-05 18:03:55 +00:00
Ying Wang
ceddb389b4 am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions." 
* commit 'b33fe50a634e4fde635f7e662526db1c3e2cfa5c':
  libcore_to_document and junit_to_document are no longer functions.
 2013-12-05 17:56:45 +00:00
Ying Wang
b33fe50a63 am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions." 
* commit 'dcbde1b02ad69c18509afd87974c72c3a22f45dd':
  libcore_to_document and junit_to_document are no longer functions.
 2013-12-05 09:47:04 -08:00
Ying Wang
dcbde1b02a Merge "libcore_to_document and junit_to_document are no longer functions." 2013-12-05 17:39:59 +00:00
John Spurlock
6c4557d09c Merge "Volume panel should not clear system ui flags." 2013-12-05 16:53:53 +00:00
Brian Carlstrom
e2aad50479 am 4a657244: am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 
* commit '4a657244b3de44cf28aae952b8dc76f8598c61cb':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
 2013-12-05 15:34:24 +00:00
Brian Carlstrom
4a657244b3 am 59595f7a: am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 
* commit '59595f7a3e8efcefc62bbcf8e085b6da6d8ea339':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
 2013-12-05 15:29:41 +00:00
Brian Carlstrom
59595f7a3e am 8026b2ce: Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 
* commit '8026b2ce23396262ad1f1e7a75093cd0e2467d4b':
  Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf.
 2013-12-05 07:25:20 -08:00
Kenny Guy
286db5e28c Merge "Fix setLong so it actualy uses userHandle passed in." 2013-12-05 09:58:04 +00:00
Brian Carlstrom
8026b2ce23 Merge "Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf." 2013-12-05 06:20:48 +00:00
John Huang
1baf84d267 am 66a9ebfd: am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting generic SIM communication." 
* commit '66a9ebfd2fba0b94d84c6bf7bf98b9db7f9fb3b3':
  RIL changes for supporting generic SIM communication.
 2013-12-05 02:45:32 +00:00
Dirk Dougherty
6dc25c89d3 am d5967e77: am e8b49c43: am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'd5967e777e977d66f716dbf935e16c2b5f51ec6f':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-05 02:45:13 +00:00
Mathieu Chartier
a1a19d28d0 Use exceptionCheck after VMRuntime.newNonMovableArray/addressOf. 
Since VMRuntime.newNonMovableArray and VMRuntime.addressOf are java
methods implemented in Native, they don't necessarily return NULL
when an exception is thrown. Checking the exception instead of the
return value fixes errors which may occur if the runtime returns
garbage when an exception is pending.

Bug: 11971220
Change-Id: I70478834c9f14cc5d9e666e1e174d3fd09269719
 2013-12-04 17:58:37 -08:00
John Huang
66a9ebfd2f am c91c7b4b: am 2e12e052: Merge "RIL changes for supporting generic SIM communication." 
* commit 'c91c7b4b5d61e2121cd60c5c27a6a8df0ecf155e':
  RIL changes for supporting generic SIM communication.
 2013-12-05 01:12:12 +00:00
John Huang
c91c7b4b5d am 2e12e052: Merge "RIL changes for supporting generic SIM communication." 
* commit '2e12e0522641649d363a1c6ede9be9af235197fa':
  RIL changes for supporting generic SIM communication.
 2013-12-04 17:09:18 -08:00
John Huang
2e12e05226 Merge "RIL changes for supporting generic SIM communication." 2013-12-05 00:59:36 +00:00
Ying Wang
50a0fd50f7 libcore_to_document and junit_to_document are no longer functions. 
They are evaluated only once in the corresponding export .mk file.
This fixes build log spam reported in:
https://code.google.com/p/android/issues/detail?id=63184

Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
 2013-12-04 16:58:59 -08:00
Adam Powell
cc84ff4f31 Add a config override for ViewConfiguration#hasPermanentMenuKey 
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.

Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.

Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
 2013-12-04 16:56:26 -08:00
Ying Wang
95727fd624 Merge "libcore_to_document and junit_to_document are no longer functions." 2013-12-05 00:53:46 +00:00
Ying Wang
c79d6a9bd6 libcore_to_document and junit_to_document are no longer functions. 
They are evaluated only once in the corresponding export .mk file.
This fixes build log spam reported in:
https://code.google.com/p/android/issues/detail?id=63184

Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
 2013-12-04 16:01:06 -08:00
Dirk Dougherty
d5967e777e am e8b49c43: am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'e8b49c433156b450289a4cd7ff1a7c8d7f05ebb8':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-04 22:13:47 +00:00
Dirk Dougherty
e8b49c4331 am c09e0ee9: am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'c09e0ee90e00acbde85a6b3ee4413ca6e245f601':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-04 14:09:59 -08:00
Dirk Dougherty
c09e0ee90e am c9cad879: Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 
* commit 'c9cad879597dd15983a35fbf997898a771672a69':
  Doc change: add cropped kk device image and adjust position on highlights doc.
 2013-12-04 22:05:51 +00:00
Dirk Dougherty
c9cad87959 Merge "Doc change: add cropped kk device image and adjust position on highlights doc." into klp-docs 2013-12-04 22:01:41 +00:00
Dirk Dougherty
56278b7e14 Doc change: add cropped kk device image and adjust position on highlights doc. 
Change-Id: I927091e1251c5477de4462a61c01c9bcf82ad9e2
 2013-12-04 13:55:59 -08:00
Geoff Mendal
fa706a88a3 am ece1bc51: (-s ours) am f6e6e160: (-s ours) am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit 'ece1bc5174ec38e77894a7e13ab814e272f4dc16':
  Import translations. DO NOT MERGE
 2013-12-04 21:18:36 +00:00
Geoff Mendal
ece1bc5174 am f6e6e160: (-s ours) am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit 'f6e6e1606234a5a9ee9c2eeb2f8c06392b2b7f10':
  Import translations. DO NOT MERGE
 2013-12-04 21:12:50 +00:00
Geoff Mendal
f6e6e16062 am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit '82af5d893102dfb51257f2a4ff97c0c4c36fdd1a':
  Import translations. DO NOT MERGE
 2013-12-04 13:07:57 -08:00
Geoff Mendal
82af5d8931 am 6d25c934: (-s ours) Import translations. DO NOT MERGE 
* commit '6d25c934dcdf7a098d4e9f96cb206789dfd4afb7':
  Import translations. DO NOT MERGE
 2013-12-04 13:01:30 -08:00
Geoff Mendal
155e8ddf98 Merge "Import translations. DO NOT MERGE" 2013-12-04 20:23:34 +00:00
Geoff Mendal
47b73a05d4 Import translations. DO NOT MERGE 
Change-Id: Ic23f9b9d0544004948470e20f919f4d564c88926
Auto-generated-cl: translation import
 2013-12-04 12:09:45 -08:00
Geoff Mendal
279c058b99 Merge "Import translations. DO NOT MERGE" 2013-12-04 20:03:26 +00:00
Geoff Mendal
872cc63e20 Import translations. DO NOT MERGE 
Change-Id: Ia65f6a994329de16584d85fbabbee9a7113f9b20
Auto-generated-cl: translation import
 2013-12-04 12:00:50 -08:00
Geoff Mendal
6d25c934dc Import translations. DO NOT MERGE 
Change-Id: Ia2a23f77b1bb0b7fc9d731a185f3104d963cb44d
Auto-generated-cl: translation import
 2013-12-04 11:35:25 -08:00
John Spurlock
414c1f0e86 Volume panel should not clear system ui flags. 
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.

Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.

Reverts part of I25f29af5b6518aba695b64a75977ae240b742118

Bug:11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
 2013-12-04 13:47:36 -05:00
Leon Scroggins III
aec09b6b98 Merge "Call SkBitmap::config() instead of ::getConfig()" 2013-12-04 18:14:29 +00:00