Jeff Sharkey
5afc45971a
am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
...
* commit 'a1af0d42e47379e83500dbbb1949bf93033f3be6':
PackageInstaller API refactoring.
2014-08-15 23:10:13 +00:00
Ihab Awad
ac1dc1add6
am 578d6c7d: Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev
...
* commit '578d6c7d3404563a5c62afa4140e1db085c34e06':
Fix problems with wiring of initializing calls (1/2)
2014-08-15 23:03:43 +00:00
Baligh Uddin
7969be0bb8
am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '5c7015d764e55d60100670fad5d3c0ca40adebf5':
Import translations. DO NOT MERGE
2014-08-15 22:35:51 +00:00
Baligh Uddin
fc5f24d874
am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'db511f2372fb542baa83838d9552d249a8c2f164':
Import translations. DO NOT MERGE
2014-08-15 22:35:47 +00:00
Baligh Uddin
bd42c307c4
am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'e2541778bfe330449612c02661257318f69916bd':
Import translations. DO NOT MERGE
2014-08-15 22:35:43 +00:00
Baligh Uddin
0039271391
am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'a519df6a42ed2937544b7a0e8aa831507fe3c09e':
Import translations. DO NOT MERGE
2014-08-15 22:35:39 +00:00
Baligh Uddin
5b63492976
am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '3f374ac15c99468abee39489c23dfa3f571689b1':
Import translations. DO NOT MERGE
2014-08-15 22:35:35 +00:00
Baligh Uddin
129ad0e15b
am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'ad6b1426f3cc912c2a30b59270a4b9c38fd7d3c6':
Import translations. DO NOT MERGE
2014-08-15 22:20:17 +00:00
Baligh Uddin
062feaf395
am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '2f53238fe440d8615d8874e2fb23535c29b47aec':
Import translations. DO NOT MERGE
2014-08-15 22:20:13 +00:00
Baligh Uddin
b2df3e40d5
am 97ffe946: (-s ours) Import translations. DO NOT MERGE
...
* commit '97ffe946f1e9aa961e3278f84b344a4a93b02210':
Import translations. DO NOT MERGE
2014-08-15 22:20:09 +00:00
Robert Greenwalt
2d6c37cd66
am 90e32866: Merge "Configure MTU based on network MTU parameter" into lmp-dev
...
* commit '90e32866d257e2d3ab66a2c8c59abb179a080797':
Configure MTU based on network MTU parameter
2014-08-15 22:16:57 +00:00
Jeff Davidson
c4f1557ba2
am bffe81a7: Merge "Fix default scorer provisioning." into lmp-dev
...
* commit 'bffe81a70721acab9e8b912206559cd53725c6c7':
Fix default scorer provisioning.
2014-08-15 22:00:58 +00:00
Jay Shrauner
1cfb60f0b5
am 4a21b277: Merge "Prevent ConcurrentModificationExceptions" into lmp-dev
...
* commit '4a21b277b9ae7087c1dad6c13b50c50d6af7c733':
Prevent ConcurrentModificationExceptions
2014-08-15 22:00:53 +00:00
Adam Lesinski
9e4056b7af
am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
...
* commit '2fdf2db8f15a23fea354ecbf4929585dc4c44e5c':
Fix assumption about DynamicRefTable in aapt
2014-08-15 21:53:01 +00:00
Sunny Goyal
be55d637d9
am c4949481: Merge "Returning null when preview image is not available for AppWidgetProviderInfo" into lmp-dev
...
* commit 'c49494811aa1ed42c3f0b0519cb037e239f8b0e8':
Returning null when preview image is not available for AppWidgetProviderInfo
2014-08-15 21:41:11 +00:00
Christopher Tate
1db2391d9f
am 2c286400: Merge "Tighten restore-at-install behavior" into lmp-dev
...
* commit '2c286400bf4913c24dea7d0653314bdf162aaa16':
Tighten restore-at-install behavior
2014-08-15 21:41:06 +00:00
Andy Hung
efb3a8b37a
Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev
2014-08-15 21:23:40 +00:00
Jeff Brown
c13ff2e4f5
Merge "Revert "Throw exception when inset drawable is missing drawable attribute"" into lmp-dev
2014-08-15 21:23:40 +00:00
Jeff Brown
2e1c9b517e
Revert "Throw exception when inset drawable is missing drawable attribute"
...
This reverts commit b16a6331cce2c3559ed9414c6aca238c5042e919.
Bug: 17072675
Change-Id: Ie2403095df10aa0dd18545a3d2a323ae463037e4
2014-08-16 02:06:16 +00:00
Alan Viverette
0a9614f5fb
Throw exception when inset drawable is missing drawable attribute
...
BUG: 17068252
Change-Id: Id9c9791501ce9d56fdd67236c84775550c89032c
2014-08-15 14:28:30 -07:00
Alan Viverette
aeda0586f3
Merge "Fix date and time picker styling" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
7ca0bb5d4d
Merge "Better handling of unresolved theme attributes" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
34a14f967a
Better handling of unresolved theme attributes
...
Also adds a (very obviously wrong) default color to RippleDrawable
Change-Id: I6d29b371f4e59accbebf25eb059b1f372b9184b0
2014-08-15 17:15:39 -07:00
Alan Viverette
6a2f703fed
Merge "Scrapping the view at position zero is still position zero" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
4771b55d13
Scrapping the view at position zero is still position zero
...
BUG: 16418789
Change-Id: I8334d6b37efa1f853152ef2cea041db69e41d24e
2014-08-15 18:02:23 -07:00
Alan Viverette
14a0fbf225
Merge "Fix menu styling" into lmp-dev
2014-08-15 21:23:40 +00:00
Alan Viverette
b9e1a7c226
Fix menu styling
...
BUG: 17069607
Change-Id: Ic6b46fc56546f0e472509110d378c2662f6b4583
2014-08-15 17:32:22 -07:00
Alan Viverette
cf8f58350b
Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev
2014-08-15 21:23:40 +00:00
Jeff Davidson
cab3eb0c0b
Merge "Fix default scorer provisioning." into lmp-dev
2014-08-15 21:23:40 +00:00
Adam Lesinski
91348eb957
Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev
2014-08-15 21:23:40 +00:00
Christopher Tate
6cbc07b7c0
Merge "Tighten restore-at-install behavior" into lmp-dev
2014-08-15 21:23:40 +00:00
Andy Hung
ad720aeea7
Fix 7.1 audio playback from AudioTrack
...
Uses AudioFormat.CHANNEL_OUT_7POINT1_SURROUND.
Bug: 16951383
Change-Id: I7e94598d5cae1a741b8b1e0492b202163bf9f9fd
2014-08-15 14:23:06 -07:00
Alan Viverette
518ff0de95
Fix date and time picker styling
...
Removes done buttons from widgets, fixes date picker day selection, fixes
dialog layouts in landscape, updates colors. Adds API on AlertDialog for
setting the view by resource ID, which is necessary to correctly inflate
the view against the dialog's parent view.
BUG: 16941550
BUG: 16852521
BUG: 16878697
BUG: 16838659
BUG: 17047435
Change-Id: I138858ce06cd4abf68a2c3361ec170370236b33b
2014-08-15 14:20:35 -07:00
Justin Mattson
d3077b95f8
am f6c0767d: Merge "Add fragment animations to setup leanback theme" into lmp-dev
...
* commit 'f6c0767d46d5f42129a760c705ad0cb6e1e2fbe6':
Add fragment animations to setup leanback theme
2014-08-15 21:03:06 +00:00
Adam Lesinski
2cb761e3dd
Fix assumption about DynamicRefTable in aapt
...
Packages without any resources should not expect to have
a DynamicRefTable.
Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
2014-08-15 14:01:43 -07:00
Amith Yamasani
f62621845c
am a728a418: Merge "Copy certain settings to the managed profile" into lmp-dev
...
* commit 'a728a4182ab5db257e6a1f90519c10ae00f29967':
Copy certain settings to the managed profile
2014-08-15 20:52:44 +00:00
Julia Reynolds
bceac60c98
am 08aeb505: Merge "Apply lockdowns when user restrictions are set." into lmp-dev
...
* commit '08aeb505d0f65c678e27214170aaf7ad14b88c79':
Apply lockdowns when user restrictions are set.
2014-08-15 20:31:49 +00:00
Baligh Uddin
97ffe946f1
Import translations. DO NOT MERGE
...
Change-Id: I5fab20b0d39b9e396111791a55046a8485f073d9
Auto-generated-cl: translation import
2014-08-15 12:57:31 -07:00
Chris Craik
40f67da884
Merge "Fix glyph positions underflow issue" into lmp-dev
2014-08-15 19:21:54 +00:00
Chris Craik
39c5e7cbdf
Fix glyph positions underflow issue
...
bug:16450675
Avoid using unsigned ints in math with negative numbers
Change-Id: Icdfb72451f03380dbf78b3703793869b2cd4e751
2014-08-15 15:46:37 -07:00
Jay Shrauner
a69adf7535
Merge "Prevent ConcurrentModificationExceptions" into lmp-dev
2014-08-15 19:21:54 +00:00
Jay Shrauner
229e3820dc
Prevent ConcurrentModificationExceptions
...
Use sets backed by ConcurrentHashMaps instead of HashSets, and
CopyOnWriteArrayLists instead of ArrayLists, to prevent concurrent
exceptions if listeners try to remove themselves in callbacks while
iterating over the listeners.
Bug:16325026
Change-Id: I55e081eda6ba19fa466bbf019c648bbdaf833c33
2014-08-15 13:41:53 -07:00
Amith Yamasani
af059c65a1
Merge "Update strings for guest session dialog" into lmp-dev
2014-08-15 19:16:59 +00:00
Amith Yamasani
d1e2cc3e2c
Update strings for guest session dialog
...
Bug: 16898180
Change-Id: I29b96a8ef3280d9d582562c245ca12a1d65eb878
2014-08-15 17:23:45 -07:00
Adrian Roos
529fd10831
am 384e2274: Fix errors that could lead to brightness flickering
...
* commit '384e2274834a788e1808951a2b486c14daf474ab':
Fix errors that could lead to brightness flickering
2014-08-15 19:16:10 +00:00
Lajos Molnar
be5e3359b1
Merge "media: minor fixes for MediaCodecInfo" into lmp-dev
2014-08-15 19:14:43 +00:00
Lajos Molnar
981c344ee7
media: minor fixes for MediaCodecInfo
...
- use equals() for Range singularity checks
- parse max-channel-count properly
- add platform defaults to G711 and GSM audio codecs
- allow xml to override platform limits if format,
profile or level is not supported (but recognized to be
possibly valid) by the platform
- set defaut format fields
Bug: 11990470
Change-Id: I06114e2d10dcc205a8a963605a01e6d4f6ecd0f0
2014-08-15 17:35:30 -07:00
Amith Yamasani
d97a0e7281
Merge "Copy certain settings to the managed profile" into lmp-dev
2014-08-15 19:14:43 +00:00
Amith Yamasani
4f7e2e334e
Copy certain settings to the managed profile
...
All reads of those specific settings will go to the primary user.
Inserts to primary also go to managed profiles in order to notify
any observers.
This enables Location settings to be shared by both profiles.
Also some other settings related to IME and Accessibility since
those services are shared across the profiles.
Bug: 16457210
Change-Id: Ib8fd697b5c78027fcbaf245d82dda5e6d6aab4f0
2014-08-15 13:42:21 -07:00
Robert Greenwalt
bd431ee5d3
Merge "Configure MTU based on network MTU parameter" into lmp-dev
2014-08-15 19:10:34 +00:00