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

155852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
bae5d85a77 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-20 13:41:25 +00:00
Geoff Mendal
d113e1b189 Import translations. DO NOT MERGE 
Change-Id: I9d2178c81e9acc3ce353f317787cb12f6e158666
Auto-generated-cl: translation import
 2014-10-20 06:35:29 -07:00
Adrian Roos
f4f36166b0 am 45f64af8: am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit '45f64af8f238bc502f6278bef1a57b3d684b227e':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:11:42 +00:00
Adrian Roos
5f978bfa09 Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 2014-10-20 13:04:09 +00:00
Adrian Roos
45f64af8f2 am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit '9c5896b808f77295aa5cd09cb37ad01bccd7994c':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:04:00 +00:00
Adrian Roos
9c5896b808 Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 2014-10-20 12:59:00 +00:00
Dongwon Kang
49c1b69a56 TIF: add more documentation on Hardware session. 
Bug: 17909341
Change-Id: Ie537eb77b6ac4b63e4e9306c1781f84dd4be2719
 2014-10-20 18:26:50 +09:00
Yuncheol Heo
0608b9328b CEC: Add a callback for vendor when HDMI control setting is changed. 
- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
  distinguish whether the message is broadcast or not.

Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
 2014-10-20 16:47:24 +09:00
Jinsuk Kim
7a78e578d7 Merge "CEC: add getDeviceList()" into lmp-mr1-dev 2014-10-20 03:02:44 +00:00
Jinsuk Kim
bdf27fbf74 CEC: add getDeviceList() 
Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.

For this, turned the local device address list to unmodifiable so that it can
be used by any threads.

Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.

Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
 2014-10-20 11:32:47 +09:00
Baligh Uddin
ffcdb67922 am b42786f4: (-s ours) am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b42786f4911368800116e671dee54079d3bee29f':
  Import translations. DO NOT MERGE
 2014-10-19 22:23:53 +00:00
Baligh Uddin
f2c7c32288 am 478ad70c: (-s ours) am a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '478ad70c488fec5b1c014febad42161e3713f0c2':
  Import translations. DO NOT MERGE
 2014-10-19 22:23:50 +00:00
Baligh Uddin
b42786f491 am 67b404d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '67b404d688e8da44d104d54c78a8e37f88a4529b':
  Import translations. DO NOT MERGE
 2014-10-19 22:17:13 +00:00
Baligh Uddin
478ad70c48 am a4cbfb82: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a4cbfb822ea1afc110dc974f22e22906741f5c2e':
  Import translations. DO NOT MERGE
 2014-10-19 22:17:10 +00:00
Baligh Uddin
67b404d688 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:42 +00:00
Baligh Uddin
a4cbfb822e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:39 +00:00
Baligh Uddin
3b7e7817c5 Import translations. DO NOT MERGE 
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
 2014-10-19 13:18:18 -07:00
Baligh Uddin
475737db01 am 425c06a0: (-s ours) am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '425c06a0b08f7ef1de396cd4cf6bc490171cc2e7':
  Import translations. DO NOT MERGE
 2014-10-19 20:07:19 +00:00
Baligh Uddin
02e4726063 am 297013dd: (-s ours) am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '297013dd4cee3f27f1df73bde642d8636492954b':
  Import translations. DO NOT MERGE
 2014-10-19 20:07:16 +00:00
Baligh Uddin
df7806249f am 4ceb3c04: (-s ours) am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit '4ceb3c0412985dfa8f517bee024fd7e978156394':
  Import translations. DO NOT MERGE
 2014-10-19 20:07:12 +00:00
Baligh Uddin
425c06a0b0 am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4199680a9da3fa01be65606e735deab3be089b23':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:36 +00:00
Baligh Uddin
297013dd4c am 7fda5c91: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7fda5c91e5cb77e29852dd093bbbe0a2667cf2c7':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:33 +00:00
Baligh Uddin
4ceb3c0412 am cfccba99: (-s ours) Import translations. DO NOT MERGE 
* commit 'cfccba99a234a5883300a7542ec12ddfec012ff3':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:29 +00:00
Baligh Uddin
b5c8ec76d7 Import translations. DO NOT MERGE 
Change-Id: I382cff15f6fd4e02e2781bbb2b51e7eb3897b6fc
Auto-generated-cl: translation import
 2014-10-19 12:55:23 -07:00
Baligh Uddin
4199680a9d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
7fda5c91e5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
cfccba99a2 Import translations. DO NOT MERGE 
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
 2014-10-19 10:56:51 -07:00
Baligh Uddin
b18d26738d Import translations. DO NOT MERGE 
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
 2014-10-19 10:52:12 -07:00
Baligh Uddin
7d369a6d5b Import translations. DO NOT MERGE 
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
 2014-10-19 10:50:27 -07:00
smain@google.com
b5eadbe690 am 27d8656c: am a2f07a88: add info about device owner app to the workplace highlights 
* commit '27d8656c16f62e58625a4b861df512d18c6931e5':
  add info about device owner app to the workplace highlights
 2014-10-19 07:40:01 +00:00
smain@google.com
27d8656c16 am a2f07a88: add info about device owner app to the workplace highlights 
* commit 'a2f07a88aa92d60b28295e84f440dbb4025d3eeb':
  add info about device owner app to the workplace highlights
 2014-10-19 02:42:00 +00:00
smain@google.com
a2f07a88aa add info about device owner app to the workplace highlights 
Change-Id: Ib1c5809e0d9e923fd71f4b33b1ef44091f1f3df4
 2014-10-18 18:20:20 -07:00
smain@google.com
6ff0ce2338 am fb604203: am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit 'fb604203d2b14d6a757810397b7c6897136fb2be':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:13:40 +00:00
smain@google.com
fb604203d2 am f3e585ab: Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 
* commit 'f3e585ab20be006c8d5f3a033f9ade8a9dc6b55f':
  add glare effect to screenshot and add 1x version with srcset
 2014-10-19 00:08:50 +00:00
smain@google.com
f3e585ab20 Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev 2014-10-19 00:04:54 +00:00
smain@google.com
02f9a5d4d7 add glare effect to screenshot and add 1x version with srcset 
Change-Id: I28ccd7bf509a65859b81e4fed8c63fbe62dad0b4
 2014-10-18 16:44:06 -07:00
smain@google.com
37e5110577 am e91b7b11: am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit 'e91b7b11acf70006c964f8f8d89967a90591df67':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:24:17 +00:00
smain@google.com
e91b7b11ac am 9e9d5a36: add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there. 
* commit '9e9d5a369fb00730d58220eaa79082e351cf8bcd':
  add info about workspaces to the lollipop highlights also move the workplace launcher image from the API Overview to the highlights... and also just remove all images from the Overview for simplicity there.
 2014-10-18 23:19:40 +00:00
smain@google.com
9e9d5a369f add info about workspaces to the lollipop highlights 
also move the workplace launcher image from the API Overview to
the highlights... and also just remove all images from the Overview
for simplicity there.

Change-Id: I36cc6d58efa6c5c912971b8636fde064b0f26797
 2014-10-18 16:14:42 -07:00
Prem Kumar
cffccb304f am 3f12569d: am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit '3f12569dff185ad5a3ec51d8bd9953ad13a6b534':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 20:01:50 +00:00
Prem Kumar
3f12569dff am 7666c912: Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 
* commit '7666c912b820e61c58b57ad691b4b3babca9fbf9':
  set autojoin associated scan frequency to 20 seconds
 2014-10-18 19:56:03 +00:00
Prem Kumar
7666c912b8 Merge "set autojoin associated scan frequency to 20 seconds" into lmp-dev 2014-10-18 19:51:53 +00:00
Dianne Hackborn
ed512c817c Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev 2014-10-18 00:42:24 +00:00
Alan Viverette
a496ba5552 am e61519b4: am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit 'e61519b4a541a4262389842ae8b72dac401b2199':
  Translate compound button drawable by scroll position
 2014-10-18 00:32:17 +00:00
Wei Wang
020bd7b861 Remove spammy log information for BLE scan. 
Bug:17574681
Change-Id: Ic5761ad7262200f38f2b67659c37f8a3f01d80d5
 2014-10-18 00:29:57 +00:00
Alan Viverette
e61519b4a5 am 15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev 
* commit '15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
  Translate compound button drawable by scroll position
 2014-10-18 00:26:21 +00:00
Alan Viverette
15e7b2ac60 Merge "Translate compound button drawable by scroll position" into lmp-dev 2014-10-18 00:20:27 +00:00
Alan Viverette
b95c336d78 Translate compound button drawable by scroll position 
BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
 2014-10-17 17:19:12 -07:00
Andrew Lee
1557a226a7 Merge "Add functions to update on conference changes." into lmp-mr1-dev 2014-10-18 00:15:36 +00:00
Kristian Monsen
f247b90864 am 4183a2fc: am 5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev 
* commit '4183a2fc83369996499dfffcfb4113cb6b506165':
  Let TYPE_ANNOUNCEMENT be sent from any window
 2014-10-18 00:03:06 +00:00