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

149321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
684c772ddd Merge "Fix crash when reset() gets called during an animation" into lmp-dev 2014-08-16 04:29:45 +00:00
Jorim Jaggi
0d9f35d1d8 Fix crash when reset() gets called during an animation 
Bug: 17058023
Change-Id: I2ed77b49c4daf1790e43f74a274054618e378b40
 2014-08-20 17:08:44 +02:00
Jorim Jaggi
909cb49a10 Merge "Fix QS expansion weirdness #2" into lmp-dev 2014-08-16 04:29:45 +00:00
Jorim Jaggi
b7a3303f80 Fix QS expansion weirdness #2 
Bug: 17138703
Bug: 17047680
Change-Id: I4058d9a2e349c4a52ab167638471a1eb11753380
 2014-08-20 16:21:36 +02:00
Kenny Guy
545de86fca Merge "First part of renaming methods in LauncherApps." into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prevot
f52233df74 Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prévot
2e365c805a Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev 2014-08-16 04:29:45 +00:00
Nicolas Prévot
6d24849387 Revert "Adding the requiredForProfile flag." 
This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a.

BUG: 17102702

Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c
 2014-08-18 12:51:11 +01: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
Jungshik Jang
8e6e1e2e82 Merge "Use id to find proper HdmiDeviceInfo instead of ojbect itself." into lmp-dev 2014-08-16 04:25:55 +00:00
Jungshik Jang
cf445877c6 Use id to find proper HdmiDeviceInfo instead of ojbect itself. 
TvInputHardwareManager manages internal device info and update
it by remove or add method of List collection. However,
HdmiDeviceInfo overrides equals method and remove may not work
if incoming HdmiDeviceInfo has different power status.
Instead, this change iterates all HdmiDeviceInfo and compares
id of HdmiDeviceInfo.

Bug: 17145753
Change-Id: Ia5de3e33cf05b28fa2bd108d99e78de09b838fb3
 2014-08-20 15:06:01 +09:00
Jinsuk Kim
9727b33297 Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev 2014-08-16 04:25:55 +00:00
Jinsuk Kim
87f22a2870 CEC: Hook up device select API to MHL device RAP 
This lets the input selection on UI perform MHL RAP signalling, and
CEC routing control.

Bug: 17141884
Change-Id: Ic1605175c5779a9a3c43df954baf9fdb6f154d36
 2014-08-20 12:35:32 +09:00
Jinsuk Kim
8809f1e547 Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 2014-08-16 04:25:55 +00:00
Jinsuk Kim
ed0864557b CEC: Invoke events listener upon MHL device state change 
With this change, mobile devices state changes are propagated through
TIF to UI, hence the input pickers shows the mobile devices as
expected.

Bug: 16986744
Change-Id: Id633207acf4f814f57d43cc1de5f8cb88ac23ad6
 2014-08-19 13:41:51 +09:00
Jungshik Jang
3b57e1d129 Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 2014-08-16 04:25:55 +00:00
Jungshik Jang
5691b2f229 Remove parameter field in HdmiCecKeycode. 
Since we don't support mapping between android key and parameterized
cec keycode, remove parameter fields in HdmiCecKeycode.

Bug: 17099253
Change-Id: I8b6b6b361f0c343b0a263240b49e41bf289d36ca
 2014-08-19 09:49:30 +09:00
Ji-Hwan Lee
0c3b4ad7b6 Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 2014-08-16 04:25:55 +00:00
Ji-Hwan Lee
4835497886 TIF: Remove session state when hardware wrapper input crashes 
Change-Id: I2306cc407a19892c1895ee70bd6bd52b1a3bd4f3
 2014-08-17 04:51:18 +09: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
5e85359a36 Merge "CEC: Broadcast language setting whenever it changes" into lmp-dev 2014-08-16 04:15:21 +00:00
Terry Heo
1ca0a43251 CEC: Broadcast language setting whenever it changes 
Bug: 16995278
Change-Id: Id695d4d2f213cd8039c9915f3d4e451e829e715c
 2014-08-18 11:16:05 +09:00
Jungshik Jang
b26fcf68e1 Merge "Disable device when it's removed or disabled." into lmp-dev 2014-08-16 04:15:21 +00:00
Jungshik Jang
0ec59fa2b3 Disable device when it's removed or disabled. 
Bug: 17122583
Change-Id: Iabda3123ab7e3366c53ae39d9887cb0dd90bdd89
 2014-08-20 14:36:54 +09:00
Terry Heo
a890ec19d0 Merge "CEC: Fix JNI initialization error of HdmiMhlController" into lmp-dev 2014-08-16 04:12:14 +00:00
Terry Heo
4926b87243 CEC: Fix JNI initialization error of HdmiMhlController 
Correct signature of nativeSendScratchpadCommand.

Bug: 17096490
Change-Id: I9694cb3b10724e34d507588fc3946318bb378398
 2014-08-20 03:26:47 +00:00
Jungshik Jang
5ba6906768 Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev 2014-08-16 04:12:14 +00:00
Jungshik Jang
350e68d0b8 Clean up MHL local devices when HdmiControlService turns into disabled state 
Bug: 17122583
Change-Id: Id8f17faf9891952c762f86b46a89732f1497c5fc
 2014-08-19 18:56:21 +09:00
Jaewan Kim
67d666f604 Merge "Fix NPE when passing null TvContentRating" into lmp-dev 2014-08-16 04:12:14 +00:00
Jaewan Kim
a42be3c950 Fix NPE when passing null TvContentRating 
Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07
 2014-08-19 11:55:07 +09: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
John Spurlock
c2c8242194 Merge "Volume: Shave 12dp off of the volume dialog." into lmp-dev 2014-08-16 04:03:42 +00:00
John Spurlock
4e3eb1a2d3 Volume: Shave 12dp off of the volume dialog. 
Bug:17004538
Change-Id: If1eb12a2bd4035b971347a27d000f90f8a2361a2
 2014-08-20 15:54:19 -04:00
Jason Monk
9b4d6dd3db Merge "Add hotspot tile to defaults" into lmp-dev 2014-08-16 04:03:42 +00:00
Jason Monk
15eb388fc5 Add hotspot tile to defaults 
So that it can show up on devices.

Bug: 17151619
Change-Id: I9fe8697dfa099ede3b17098b85beecaaed656ecf
 2014-08-20 10:23:48 -04:00
Jason Monk
a0efbdf204 Merge "Update the QS footer from UI thread" into lmp-dev 2014-08-16 04:03:42 +00:00
Jason Monk
b1c2f3bb10 Update the QS footer from UI thread 
Bug: 17070248
Change-Id: I0d72ce6e137f42ad321b3fd6b10b9a5f35ca7801
 2014-08-20 10:55:53 -04:00
Winson Chung
dd7930354a Merge "Adding shadows to the focus state and fab button. (Bug 16950262)" into lmp-dev 2014-08-16 04:03:42 +00:00
Winson Chung
f95c7f5727 Adding shadows to the focus state and fab button. (Bug 16950262) 
- Fixing regression where we weren't resetting the dim colors properly.

Change-Id: Ib95cc96d40f80bc22b7ecd7c816d5cbaa9b592c5
 2014-08-19 20:45:37 +00:00
John Spurlock
03374ccc4c Merge "QS: Enhance color inversion tile usage detection." into lmp-dev 2014-08-16 04:03:42 +00:00
John Spurlock
e1f653350e QS: Enhance color inversion tile usage detection. 
- Detect all setting changes, not only when "listening".
 - Handle the case where the setting was turned on when SystemUI
   was not running.

Bug:17107137
Change-Id: I7de098bdf52695166a8893461ba706bad05050bc
 2014-08-18 15:37:59 -04:00