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

147948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Michael Wright
5e8abf8ede Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev 2014-08-16 03:56:00 +00:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API 
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
 2014-08-17 17:59:22 -07:00
Michael Wright
8e5482f6ed Merge "Change 'disable hardware keyboard' to 'show input method'" into lmp-dev 2014-08-16 03:52:42 +00:00
Michael Wright
665366a305 Change 'disable hardware keyboard' to 'show input method' 
Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
 2014-08-17 17:51:19 -07:00
Robert Greenwalt
3f05bf4d78 Add tcp buffer size conduit to NetworkAgent. 
bug: 16549611
Change-Id: I7d97dedea2c7c1aed2eccb185645889424508591
 2014-08-17 15:14:29 -07:00
Robert Greenwalt
804322564b Merge "Fix a logic error so mtu works." into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
c27c397ec3 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 04:01:11 +00:00
Baligh Uddin
eeb82d8289 Import translations. DO NOT MERGE 
Change-Id: I331a48ef418aa24e80bf690a566dd970e7a2b398
Auto-generated-cl: translation import
 2014-08-15 22:25:13 -07:00
Baligh Uddin
e5df258491 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
5db16fe79b Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
d4f7e6cf72 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
5398915d74 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
784006f2a1 Import translations. DO NOT MERGE 
Change-Id: I29a7b80cea6ddfa59c900472e05d9b72ba53c61f
Auto-generated-cl: translation import
 2014-08-15 22:03:24 -07:00
Baligh Uddin
0e900b611c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
80631ed867 Import translations. DO NOT MERGE 
Change-Id: I287e3613eab6a99a30a025ba979b3eae287478c3
Auto-generated-cl: translation import
 2014-08-15 22:05:22 -07:00
Baligh Uddin
812938397e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
f14c0f79e1 Import translations. DO NOT MERGE 
Change-Id: Iad4e740bda603a5a7fb00961c82f01d34b07d8d4
Auto-generated-cl: translation import
 2014-08-15 22:19:11 -07:00
Baligh Uddin
e8c130f838 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:52:42 +00:00
Baligh Uddin
ab5c77cfcc Import translations. DO NOT MERGE 
Change-Id: Idc57a1961ba0cf31e9542f6bf2666cebc7e82c68
Auto-generated-cl: translation import
 2014-08-15 22:23:37 -07:00
Dianne Hackborn
90f58b4447 Merge "Make sure we initialize to enable the default voice interaction service." into lmp-dev 2014-08-16 04:29:45 +00:00
Adam Lesinski
7911c512cf Merge "AAPT: Output only 64-bit arch when multiArch is true" into lmp-dev 2014-08-16 04:01:11 +00:00
Adam Lesinski
e47fd12905 AAPT: Output only 64-bit arch when multiArch is true 
When android:multiArch="true" in the <application> tag,
aapt dump badging should only output the 64-bit architecture
under the 'native-code' entry.

Other architectures will be emitted under the 'alt-native-code'
entry.

Bug:17061929
Change-Id: I8310b2388b06a2ed571e5e121e4989403082ba68
 2014-08-15 22:25:36 -07:00
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent 
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
 2014-08-16 04:52:56 +00:00
Baligh Uddin
1df29f0889 am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '7969be0bb858c2fdc69b72f7c8f90f1dcdba3395':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:30 +00:00
Baligh Uddin
144c0fe9b8 am fc5f24d8: (-s ours) am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fc5f24d874e36d9e2bb73b21e6ed7fcac0e1d80c':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:26 +00:00
Baligh Uddin
f3f909d48b am bd42c307: (-s ours) am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bd42c307c4c0138d36dbe22c2e1ca7e92e71b117':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:22 +00:00
Baligh Uddin
054b5bbb2b am 00392713: (-s ours) am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '0039271391089eeecb990ad0e66ba6e19f24eceb':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:18 +00:00
Baligh Uddin
eae61b82bd am 5b634929: (-s ours) am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5b634929763b1b481ad642770756bc67ac89080f':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:13 +00:00
Baligh Uddin
2abea6c457 am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '129ad0e15bafe65f3060b7bd4ea9eb973ece767b':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:45 +00:00
Baligh Uddin
0be2a43284 am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '062feaf39594df4b09fc6e1b005bb72b334f3c79':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:42 +00:00
Baligh Uddin
ec24beafec am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit 'b2df3e40d5bb08295ebb9ee72bd601d88545cc2c':
  Import translations. DO NOT MERGE
 2014-08-16 04:00:38 +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
Baligh Uddin
8e926987da Import translations. DO NOT MERGE 
Change-Id: Idc0468cdd27bc282b6386f2378ec837b214f668a
Auto-generated-cl: translation import
 2014-08-15 20:13:48 -07: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
Robert Greenwalt
43074032d6 Fix a logic error so mtu works. 
bug:17046179
Change-Id: I744a2fd425627da16d9779df3a96541506e0b6b3
 2014-08-15 17:53:05 -07: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
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
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