Santos Cordon
dbc0959682
am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev
...
* commit '5a496debeef5f2b01b90f654a97504d5ae1a6288':
Fixing wrong tag usage
2014-08-16 03:30:12 +00:00
Baligh Uddin
bc9f0bdb47
Import translations. DO NOT MERGE
...
Change-Id: I7f283fa34aa5503bb34e7a085268abb4743032dd
Auto-generated-cl: translation import
2014-08-15 20:21:53 -07:00
Baligh Uddin
291eacdd13
Import translations. DO NOT MERGE
...
Change-Id: I31fd074b4124de3fabbc62a7a161497bd2865a4c
Auto-generated-cl: translation import
2014-08-15 20:16:39 -07:00
Jeff Brown
b48e02d5b9
am e100192a: am 06579b3d: Merge "Revert "Throw exception when inset drawable is missing drawable attribute"" into lmp-dev
...
* commit 'e100192a1736350025f0df33c084d1f1ba497328':
Revert "Throw exception when inset drawable is missing drawable attribute"
2014-08-16 03:15:07 +00:00
Alan Viverette
7544bb43f0
am 95495581: am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
...
* commit '954955811273138b9262f8a1e2ae6df78bdf77e0':
Fix date and time picker styling
2014-08-16 03:14:24 +00:00
Jeff Brown
ae330728bf
am dbab7079: am 23c7b927: Add trace tag for power management.
...
* commit 'dbab7079dc0cde1026c39149f8240260ce09df8a':
Add trace tag for power management.
2014-08-16 03:14:14 +00:00
Alan Viverette
4f757674fc
am c2e9b756: am 4779a4fa: Merge "Add spinner style for use in forms" into lmp-dev
...
* commit 'c2e9b75685bd25c1c946004063c4ec9c258fb2e6':
Add spinner style for use in forms
2014-08-16 03:14:06 +00:00
Baligh Uddin
8e926987da
Import translations. DO NOT MERGE
...
Change-Id: Idc0468cdd27bc282b6386f2378ec837b214f668a
Auto-generated-cl: translation import
2014-08-15 20:13:48 -07:00
Alan Viverette
e40b205ef4
am 3adb9051: am 47eba14f: Merge "Better handling of unresolved theme attributes" into lmp-dev
...
* commit '3adb9051a29c904f3a09d82b74c41d16cfa84ca3':
Better handling of unresolved theme attributes
2014-08-16 03:13:06 +00:00
Alan Viverette
5502a547eb
am 1125e88d: am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
...
* commit '1125e88d3955f900242754691238995b45d00027':
Scrapping the view at position zero is still position zero
2014-08-16 03:12:58 +00:00
Alan Viverette
ce75e8d41f
am 74d45fa3: am a98fe1f5: Merge "Fix menu styling" into lmp-dev
...
* commit '74d45fa39184e383d793741d499133b48f7d7084':
Fix menu styling
2014-08-16 03:12:53 +00:00
Tyler Gunn
259f27ebb2
am 2949812c: am cdf84c81: Merge "Removing permission check in ConnectionService." into lmp-dev
...
* commit '2949812c361f49cf9137c06bba24580d56f33b74':
Removing permission check in ConnectionService.
2014-08-16 03:11:27 +00:00
Lajos Molnar
8c3d29abaf
am 29f4a0b4: am b5caee71: Merge "media: minor fixes for MediaCodecInfo" into lmp-dev
...
* commit '29f4a0b4394ab3cd16ae2f82dc266bcf504714d9':
media: minor fixes for MediaCodecInfo
2014-08-16 03:11:19 +00:00
Deepanshu Gupta
a4ceb9e64c
am 32faabbe: Layoutlib: Update wifi and battery icon for KK
...
* commit '32faabbe14252397b35516caa9c0d0245bfcc719':
Layoutlib: Update wifi and battery icon for KK
2014-08-16 02:23:56 +00:00
Jeff Brown
36c78993d3
am 06579b3d: Merge "Revert "Throw exception when inset drawable is missing drawable attribute"" into lmp-dev
...
* commit '06579b3dcbc2270be297820bc532567eab3db340':
Revert "Throw exception when inset drawable is missing drawable attribute"
2014-08-16 02:13:29 +00:00
Alan Viverette
d1e09df27f
am 4c200997: Merge "Fix date and time picker styling" into lmp-dev
...
* commit '4c2009971702645175ad33de5c61fe42a8206aef':
Fix date and time picker styling
2014-08-16 01:58:21 +00:00
Jeff Brown
3575a72ead
am 23c7b927: Add trace tag for power management.
...
* commit '23c7b927f620ca836c52351b54e0a26e51e03615':
Add trace tag for power management.
2014-08-16 01:58:16 +00:00
Alan Viverette
e58ab6a904
am 4779a4fa: Merge "Add spinner style for use in forms" into lmp-dev
...
* commit '4779a4fad910cfe348d930a74089e78be762927e':
Add spinner style for use in forms
2014-08-16 01:57:42 +00:00
Alan Viverette
352da5e710
am 47eba14f: Merge "Better handling of unresolved theme attributes" into lmp-dev
...
* commit '47eba14fbc336b8ade843025c0519819a4c2dbb0':
Better handling of unresolved theme attributes
2014-08-16 01:40:56 +00:00
Alan Viverette
97097b9686
am 04ce8195: Merge "Scrapping the view at position zero is still position zero" into lmp-dev
...
* commit '04ce8195af5e6863cbccd9b2fc733a81d59450a7':
Scrapping the view at position zero is still position zero
2014-08-16 01:40:51 +00:00
Alan Viverette
3d3a67d6ba
am a98fe1f5: Merge "Fix menu styling" into lmp-dev
...
* commit 'a98fe1f5026b9f21b2ee6e5d2dd150bf38f4c26c':
Fix menu styling
2014-08-16 01:40:46 +00:00
Dianne Hackborn
16ec0808b5
Make sure we initialize to enable the default voice interaction service.
...
We weren't taking care of the case of an upgrade to L. The main
change here is that the voice interaction service setting now has
an empty string when the user has explicitly said they don't want
one, so when it is null we will initialize it to its default.
Change-Id: Icdd30b4f09498f8928cea759a64628bd43bc5d0e
2014-08-15 18:34:10 -07:00
Jeff Brown
3edf5272fb
Add trace tag for power management.
...
Instrumented the basic power manager state transitions,
calling into the Power HAL, setting the display power mode,
and setting the backlight.
Bug: 17004602
Change-Id: I4e362162ddfd7292a7eea8b5d029ce3f6593c4a9
2014-08-16 01:21:41 +00:00
Deepanshu Gupta
32faabbe14
Layoutlib: Update wifi and battery icon for KK
...
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
(cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)
2014-08-16 01:11:26 +00:00
Tyler Gunn
3fc65e4241
am cdf84c81: Merge "Removing permission check in ConnectionService." into lmp-dev
...
* commit 'cdf84c81fe37661a65e87ecf9958d8a432d13478':
Removing permission check in ConnectionService.
2014-08-16 01:05:29 +00:00
Deepanshu Gupta
59eedf528c
Layoutlib: Update wifi and battery icon for KK
...
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
2014-08-15 18:03:43 -07:00
Alan Viverette
7a7189642a
am 382ee522: am 8525b72c: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev
...
* commit '382ee522ba84c398321d4c16a4919b99327da9b4':
Throw exception when inset drawable is missing drawable attribute
2014-08-16 01:01:04 +00:00
Lajos Molnar
b08b0edaea
am b5caee71: Merge "media: minor fixes for MediaCodecInfo" into lmp-dev
...
* commit 'b5caee71a6b339ea9d03fef83e4980e70d442ce8':
media: minor fixes for MediaCodecInfo
2014-08-16 00:59:04 +00:00
Alan Viverette
9a970e2968
am 8525b72c: Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev
...
* commit '8525b72c4fde6c4e1aa61062ecdc3e4bdd7896b4':
Throw exception when inset drawable is missing drawable attribute
2014-08-16 00:54:45 +00:00
Robert Greenwalt
43074032d6
Fix a logic error so mtu works.
...
bug:17046179
Change-Id: I744a2fd425627da16d9779df3a96541506e0b6b3
2014-08-15 17:53:05 -07:00
Andy Hung
11f515e58f
am 2c0b3eb3: am 97c46ebd: Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev
...
* commit '2c0b3eb3d4fa407232e8b2310573a1fb064a45b9':
Fix 7.1 audio playback from AudioTrack
2014-08-16 00:52:57 +00:00
Andy Hung
d7b43364a7
am 97c46ebd: Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev
...
* commit '97c46ebd8c117870423bd14a40ac2d7f01550582':
Fix 7.1 audio playback from AudioTrack
2014-08-16 00:46:48 +00:00
Amith Yamasani
864c65c0a1
am 45a6d3a9: am 6fcf926e: Merge "Update strings for guest session dialog" into lmp-dev
...
* commit '45a6d3a95c19bf79482e812616037496e5a4cbcb':
Update strings for guest session dialog
2014-08-16 00:38:28 +00:00
Amith Yamasani
e10e992181
am 6fcf926e: Merge "Update strings for guest session dialog" into lmp-dev
...
* commit '6fcf926ef545d9b71c77c2ec97190309d6dff51e':
Update strings for guest session dialog
2014-08-16 00:32:12 +00:00
Chris Craik
0092f069d8
am 66781f6c: am b84332d9: Merge "Fix glyph positions underflow issue" into lmp-dev
...
* commit '66781f6c31b11892b207e953e4c496c3fa022d6c':
Fix glyph positions underflow issue
2014-08-16 00:30:47 +00:00
Chris Craik
f575d8e4e2
am b84332d9: Merge "Fix glyph positions underflow issue" into lmp-dev
...
* commit 'b84332d9b94b5ad6e9ab0fd98ed466015e66d2c7':
Fix glyph positions underflow issue
2014-08-16 00:24:23 +00:00
Ruben Brunk
384681f18b
am 8d392ff3: am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
...
* commit '8d392ff3b6430b144c7b3d94aed5f0c0154c7440':
camera2: Add jpeg metadata for LEGACY shim.
2014-08-16 00:22:01 +00:00
Ruben Brunk
ffd87c21ab
am 8b90513e: am b62eea57: camera2: Fix shim aspect ratio scaling.
...
* commit '8b90513e20c7e99731e5e8c05b8705ba8c18b3b4':
camera2: Fix shim aspect ratio scaling.
2014-08-16 00:21:56 +00:00
Ruben Brunk
91ace63f12
am f1aea7f9: Merge "camera2: Add jpeg metadata for LEGACY shim." into lmp-dev
...
* commit 'f1aea7f92498e3f107350c6d1a41e211d1c764a3':
camera2: Add jpeg metadata for LEGACY shim.
2014-08-16 00:15:23 +00:00
Ruben Brunk
2020e3c2c8
am b62eea57: camera2: Fix shim aspect ratio scaling.
...
* commit 'b62eea577849e56d276c4e52b67242ae9d31ce10':
camera2: Fix shim aspect ratio scaling.
2014-08-16 00:15:18 +00:00
Ruben Brunk
a9bc355910
camera2: Fix shim aspect ratio scaling.
...
Bug: 16494207
Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
2014-08-15 23:51:52 +00:00
Tyler Gunn
af9011a73b
am 5c0aa11d: am fbcb50db: Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev
...
* commit '5c0aa11d0ca6c46abdb40b6e20f9cd44e4a63bb8':
Add BIND_CONNECTION_SERVICE permission.
2014-08-15 23:32:52 +00:00
Tyler Gunn
158cf83140
am fbcb50db: Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev
...
* commit 'fbcb50db877854e68031b157f891be29b87eb7f7':
Add BIND_CONNECTION_SERVICE permission.
2014-08-15 23:25:59 +00:00
Adam Lesinski
ec620de00c
am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
...
* commit '345efd9a6988601e67d3c0202e433144670b5e62':
Add FeatureGroup to PackageInfo
2014-08-15 23:16:50 +00:00
Jeff Sharkey
690881325f
am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev
...
* commit '61c28588f4b8d748c95791446e1ca0ca6f7df060':
PackageInstaller API refactoring.
2014-08-15 23:16:45 +00:00
Ihab Awad
6bb00a0e38
am af5e36af: am 578d6c7d: Merge "Fix problems with wiring of initializing calls (1/2)" into lmp-dev
...
* commit 'af5e36af9ddbaf8acf135d3bcdbfc00d327bbeb4':
Fix problems with wiring of initializing calls (1/2)
2014-08-15 23:12:28 +00:00
Adam Lesinski
7920573234
am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev
...
* commit '58157586ef58387bb1e49930477b8b9c90bb0991':
Add FeatureGroup to PackageInfo
2014-08-15 23:10:18 +00:00
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