46630 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Kenny Guy
0cf13701d6 Fix setLong so it actualy uses userHandle passed in.
Change-Id: Iddcd02b25890cf0a8d5569699b53e97b8640000d
2013-12-04 17:52:32 +00:00
Adam Powell
c3c4d36df0 Merge "Fix a bug in submenu presenter priority handling" 2013-12-04 03:18:34 +00:00
Adam Powell
c0cc68053e Fix a bug in submenu presenter priority handling
Now that overflow menus and the PhoneWindow-level ListMenuPresenter
can coexist, make sure that ListMenuPresenter handles submenus spawned
by itself. Introduce an internal API for menus to prefer a specific
presenter when performing item actions.

Bug 11979407

Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f
2013-12-03 18:58:29 -08:00
Alan Viverette
78c66c747b Merge "Defer event interception in FastScroller" 2013-12-04 01:57:12 +00:00
Lorenzo Colitti
66c621496f am 13d9dfb4: am 86570409: am 453a5233: Merge "Minor changes to LinkAddress."
* commit '13d9dfb495db1431623c712b36cac1fe2f3c2fc0':
  Minor changes to LinkAddress.
2013-12-04 01:35:11 +00:00
Lorenzo Colitti
86570409a2 am 453a5233: Merge "Minor changes to LinkAddress."
* commit '453a5233086b216f2a95d0879954a2af39279095':
  Minor changes to LinkAddress.
2013-12-03 17:26:06 -08:00
Victoria Lease
385739be8c Merge "Deprecate Android-specific SkPaint functions." 2013-12-03 23:30:30 +00:00
Victoria Lease
43b692d9a1 Deprecate Android-specific SkPaint functions.
The following functions were problematic:
 const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
 const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
 const void* findImage(const SkGlyph&, const SkMatrix*);

Replacing them with calls through SkGlyphCache solved a nasty crash
bug, so they have all been deprecated.

Bug: 11968757
Change-Id: Id746315d41aec5b211b78b172a883c2061130f08
2013-12-03 15:02:28 -08:00
Chris Wren
365c55cb9a Merge "use relative positioning for notification actions" 2013-12-03 22:30:04 +00:00
Chris Wren
8749ac8a4c use relative positioning for notification actions
Bug: 10531101
Change-Id: I5a55f708d9ffae3ec3582f85c2ff47aa6afa287d
2013-12-03 22:29:50 +00:00
John Spurlock
b4de207bc3 Merge "Move moveable non-public framework resources up to SystemUI" 2013-12-03 22:19:06 +00:00
Alan Viverette
4cfeedb6ae Defer event interception in FastScroller
BUG: 11273369
Change-Id: Ic380069075b6317062697298a1b928cea9f3c484
2013-12-03 14:03:24 -08:00
Leon Scroggins III
4b9a19a8f8 Call SkBitmap::config() instead of ::getConfig()
getConfig() has been deprecated.

Change-Id: I32066256ab82ac4760c752c80856d1b56d291fae
2013-12-03 15:23:11 -05:00
Leon Scroggins III
ece57d7d78 Merge "Remove call to deprecated function." 2013-12-03 18:40:30 +00:00
Lorenzo Colitti
e1ad1849f3 Minor changes to LinkAddress.
1. Simplify the parceling code. Since the InetAddress inside a
   LinkAddress can never be null, we don't need to special-case
   the case where it is.
2. Add / update method documentation.
3. Write a unit test.

Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22
2013-12-03 19:46:36 +09:00
Alan Viverette
06f37728b9 Merge "Generalize mapping between local and global View coordinates" 2013-12-03 02:42:34 +00:00
Alan Viverette
a3e0a30c26 Merge "Apply theme to PreferenceActivity headers" 2013-12-03 02:42:12 +00:00
Alan Viverette
f878c298e1 Apply theme to PreferenceActivity headers
BUG: 11900302
Change-Id: Ibd1b08b412f6e64b44b2f3f07d297ede8fa01367
2013-12-02 18:36:00 -08:00
Glenn Kasten
4a1232f814 Merge "Include more information in AudioRecord error logs" 2013-12-03 00:31:13 +00:00
Mathieu Chartier
36c245ace5 am dae9f5a5: am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."
* commit 'dae9f5a5158257c65fae014b38bde08741b97e62':
  Add dalvik.vm.gctype to enable switching between different GCs.
2013-12-03 00:10:13 +00:00
Mathieu Chartier
f3a2430a2b am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."
* commit '738fa2f64e064f5c6d1003e528cde742e262312f':
  Add dalvik.vm.gctype to enable switching between different GCs.
2013-12-02 16:00:49 -08:00
Mathieu Chartier
7e4fdec6f0 Add dalvik.vm.gctype to enable switching between different GCs.
The option passes the specified GC type into the Xgc runtime
option.

Currently the three different supported GC types are MS, CMS, SS
which represent mark-sweep, concurrent mark-sweep, mark-sweep +
semi-space hybrid.

Change-Id: I6ad95c8d12c0d1158f7c861ff0c3180761619172
2013-12-02 15:50:18 -08:00
Jason Sams
5a2ed23cbf Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2013-12-02 23:07:58 +00:00
John Spurlock
74d2480845 Move moveable non-public framework resources up to SystemUI
Specifically, non-public resources only referenced by SystemUI
and nowhere else in frameworks or system apps (via @*android:)

Remove orphan resources found during the process.

Change-Id: I005514ff1ce52e1622849bc01cd825b09fa55842
2013-12-02 17:37:40 -05:00
Leon Scroggins III
82b7b0b2af Remove call to deprecated function.
setPrefConfigTable(array) is being removed in
https://codereview.chromium.org/99473004

Change-Id: I2d7e25052861f7f1d54e2418c11204d51bb88b1e
2013-12-02 17:17:21 -05:00
Alan Viverette
8af04d8b85 Merge "Fix LongArray.addAll() to use correct arraycopy argument order" 2013-12-02 21:20:07 +00:00
Lorenzo Colitti
317d15c155 am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."
* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
  Use LinkAddress in address notifications.
2013-12-02 20:53:06 +00:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
2013-12-02 12:37:58 -08:00
Glenn Kasten
a9838afbe3 Include more information in AudioRecord error logs
Change-Id: I15ec85760d3523120925608ebe3560f901cdffd7
2013-12-02 11:50:37 -08:00
Geoff Mendal
83f3eca54b Import translations. DO NOT MERGE
Change-Id: I87073de420071cb38050754b98f3c3e9db485f45
Auto-generated-cl: translation import
2013-12-02 10:46:41 -08:00
Alan Viverette
db24d142f5 Fix LongArray.addAll() to use correct arraycopy argument order
BUG: 11709513
Change-Id: I831e74ccb008739ab315c68618c04f870f9a36a5
2013-11-27 17:38:24 -08:00
Geoff Mendal
5229164040 Import translations. DO NOT MERGE
Change-Id: Id51ce9cb79528df7df7d0473544792473514f454
Auto-generated-cl: translation import
2013-11-27 10:45:55 -08:00
Lorenzo Colitti
4806fdfbd0 am f226bc60: Merge "Use LinkAddress in address notifications."
* commit 'f226bc606af9ce5aceff6b05fc4b0200c94cb248':
  Use LinkAddress in address notifications.
2013-11-26 17:56:45 -08:00