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

151029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
72cb74b484 am fc2f256c: (-s ours) am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fc2f256c33d88f73d90f7da89503bc42582432ad':
  Import translations. DO NOT MERGE
 2014-08-16 04:20:11 +00:00
Baligh Uddin
2b49f014e9 am ddc8d474: (-s ours) am fc5f24d8: (-s ours) am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ddc8d4742671fc54776bee98e1d2dc191fc2ade2':
  Import translations. DO NOT MERGE
 2014-08-16 04:20:06 +00:00
Baligh Uddin
cfeaad5188 am fbe4307d: (-s ours) am bd42c307: (-s ours) am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fbe4307ddfcaa4e2c1de16116af49e732f9d2a71':
  Import translations. DO NOT MERGE
 2014-08-16 04:20:02 +00:00
Baligh Uddin
bf825a4502 am f059e734: (-s ours) am 00392713: (-s ours) am a519df6a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'f059e73408fa0458a971bdf92f16b2858da1492e':
  Import translations. DO NOT MERGE
 2014-08-16 04:19:58 +00:00
Baligh Uddin
79187ef1d8 am de8ffd03: (-s ours) am 5b634929: (-s ours) am 3f374ac1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'de8ffd0364b82a6f8449f98e71fe38d7b902c331':
  Import translations. DO NOT MERGE
 2014-08-16 04:19:53 +00:00
Baligh Uddin
d0e9db59d7 am 546677e3: (-s ours) am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '546677e326241b1dd3131b57cc3e740b277d44d2':
  Import translations. DO NOT MERGE
 2014-08-16 04:19:49 +00:00
Baligh Uddin
0141922cb6 am dfc65278: (-s ours) am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'dfc6527815c81a0a9c5ae62140987f96ff49cdf8':
  Import translations. DO NOT MERGE
 2014-08-16 04:19:45 +00:00
Baligh Uddin
92c91c7f7a am 4f7dec0e: (-s ours) am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE 
* commit '4f7dec0eed48cb30d53ff3f37846a18d0aa92296':
  Import translations. DO NOT MERGE
 2014-08-16 04:19:39 +00:00
Terry Heo
03861d0721 Merge "CEC: Handle Remote Control command" into lmp-dev 2014-08-16 04:12:14 +00:00
Terry Heo
3e1564ee39 CEC: Handle Remote Control command 
Generate an Android key event when a UserControl message is received.
And report menu state active when a MenuRequest message is received to
notify sender can send a UserControl message.

Bug: 16938007
Change-Id: Id8f393dc254508b9e7a6fa203f8e817fbe807e38
 2014-08-18 16:09:10 +09:00
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
Santos Cordon
bb958df02e am fe75850a: am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev 
* commit 'fe75850adbbcc63cec8f8a68ab903ab3d28ccdbc':
  Fixing wrong tag usage
 2014-08-16 04:11:33 +00:00
Brian Carlstrom
7c8318c0e8 Merge "PackageInfo is a class, not a struct" 2014-08-16 04:08:14 +00:00
Brian Carlstrom
4d4e450a39 PackageInfo is a class, not a struct 
(cherry picked from commit 646d1b8ea801d92b04ead6cbae2899d8256ec3ff)

Change-Id: Id9ddc520fbfc4787c3b267df9a35a45e8cc52d65
 2014-08-17 16:10:48 -07: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
John Reck
9eee9dca63 Merge "Don't mangle layer paint's alpha" into lmp-dev 2014-08-16 04:01:11 +00:00
John Reck
fb5899d6e0 Don't mangle layer paint's alpha 
Bug: 15918037

Change-Id: Iecca0908c6e3b77f15807f75a8294d34975533b4
 2014-08-18 08:53:36 -07:00
Chulwoo Lee
3d34b54ca8 Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev 2014-08-16 04:01:11 +00:00
Chulwoo Lee
404bef8a1d Fix ConcurrentModificationException in PersistentDataStore 
BUG: 17092853
Change-Id: I613c90b5b78ce317996edb2fda1703aaa318fb1e
 2014-08-17 23:44:49 +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
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
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
Santos Cordon
4adf4b0882 am ef80aab4: am 5a496deb: Merge "Fixing wrong tag usage" into lmp-dev 
* commit 'ef80aab4cd9042171bdd14f2afb89de72d96db06':
  Fixing wrong tag usage
 2014-08-16 03:56:27 +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
Brian Carlstrom
d2febbbd4a Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp 2014-08-16 03:56:00 +00:00
Brian Carlstrom
4eedc1018f PackageInfo is a class, not a struct 
Change-Id: Ibb30e3a13fc086adec8077c8fb8fb17ef54c36b5
 2014-08-17 16:02:33 -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
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
804322564b Merge "Fix a logic error so mtu works." into lmp-dev 2014-08-16 03:52:42 +00: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
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