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

155946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
eb379bc63a Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-13 17:30:40 +00:00
Geoff Mendal
52ad690ac3 Import translations. DO NOT MERGE 
Change-Id: Icfc1dd20d22aabd6616b38adadb9bc03a698ae83
Auto-generated-cl: translation import
 2014-10-13 10:12:54 -07:00
Geoff Mendal
757f113546 am 2bb933a5: (-s ours) am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2bb933a5129cccb29e31fe2db00109bab6805979':
  Import translations. DO NOT MERGE
 2014-10-13 14:26:19 +00:00
Geoff Mendal
2bb933a512 am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '862ecfa38a5df179bcacf7e5f0c8c2cfef994193':
  Import translations. DO NOT MERGE
 2014-10-13 14:20:20 +00:00
Geoff Mendal
862ecfa38a Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 14:17:23 +00:00
Geoff Mendal
59f3f45b5b Import translations. DO NOT MERGE 
Change-Id: Iefa534c5aef2a7e43adf030b844d91a64bd90976
Auto-generated-cl: translation import
 2014-10-13 07:16:34 -07:00
Geoff Mendal
a74a588651 am a362bacb: (-s ours) am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit 'a362bacb16d31b48e6cb7a59b40252137c899862':
  Import translations. DO NOT MERGE
 2014-10-13 14:12:05 +00:00
Geoff Mendal
a362bacb16 am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit '39217055fad3ee87bf912ac9a2ad7b186cf73eb4':
  Import translations. DO NOT MERGE
 2014-10-13 14:07:49 +00:00
Geoff Mendal
39217055fa am d700e5a3: (-s ours) Import translations. DO NOT MERGE 
* commit 'd700e5a37afec6c264609c5df4c3a6b783417330':
  Import translations. DO NOT MERGE
 2014-10-13 14:03:04 +00:00
Geoff Mendal
d700e5a37a Import translations. DO NOT MERGE 
Change-Id: Ic3cbd08f31920de16f0d21c846cde2ded2b2e3ec
Auto-generated-cl: translation import
 2014-10-13 06:57:32 -07:00
Marcin Kosiba
4c8dd87a9e am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '58ee8a966a14208c85ac304136a36602b2d75e01':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:50:35 +00:00
Marcin Kosiba
58ee8a966a am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:47:01 +00:00
Marcin Kosiba
4f3ee426f6 am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:42:58 +00:00
Marcin Kosiba
437517573b Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 2014-10-13 09:37:36 +00:00
Joe Fernandez
47d2555bbb am 843fe451: am e0b0d9a2: am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 
* commit '843fe4512746ef00b960e95aba3858d8a33897a0':
  docs: Move the L-Developer Preview samples page to the Developer Samples area
 2014-10-13 05:48:37 +00:00
Joe Fernandez
004ecc9f35 am 074c1d93: am 26ebde60: am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area 
* commit '074c1d9313c746c8e8aa6a1f581fad6b7466a1e1':
  docs: Migrate TV Design docs to main DAC-Design area
 2014-10-13 05:48:33 +00:00
Joe Fernandez
843fe45127 am e0b0d9a2: am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 
* commit 'e0b0d9a2dcfc53bb8794271081ca3b15e9792bee':
  docs: Move the L-Developer Preview samples page to the Developer Samples area
 2014-10-13 05:44:25 +00:00
Joe Fernandez
074c1d9313 am 26ebde60: am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area 
* commit '26ebde60d2cd1022e858061f74030ef2e8b4f134':
  docs: Migrate TV Design docs to main DAC-Design area
 2014-10-13 05:44:21 +00:00
Joe Fernandez
e0b0d9a2dc am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 
* commit '7e522af60ffc3de9d809a82808bf93eba9917d32':
  docs: Move the L-Developer Preview samples page to the Developer Samples area
 2014-10-13 05:40:35 +00:00
Joe Fernandez
26ebde60d2 am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area 
* commit 'cd2445a9aa1159dead4107a770b898c8305aed19':
  docs: Migrate TV Design docs to main DAC-Design area
 2014-10-13 05:40:31 +00:00
Joe Fernandez
7e522af60f Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev 2014-10-13 05:37:00 +00:00
Joe Fernandez
cd2445a9aa docs: Migrate TV Design docs to main DAC-Design area 
Change-Id: Ie9ba7e519ccdf46b58010d5ff11b4042134b7a57
 2014-10-12 22:31:41 -07:00
Jinsuk Kim
2c716fcf8f am e46fdb43: Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 
* commit 'e46fdb43c0193cb89716600a3aa17b836502e098':
  CEC: Queue actions for starting later when not ready
 2014-10-13 05:22:01 +00:00
Jinsuk Kim
e46fdb43c0 Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev 2014-10-13 05:16:11 +00:00
Joe Fernandez
8ef4edf379 am 96eecf4f: am d942d4e9: am 15edcda5: docs: migrate Android TV games page to TV training section 
* commit '96eecf4f06f8f561b630bcb36df843b0e5b47e23':
  docs: migrate Android TV games page to TV training section
 2014-10-13 04:53:36 +00:00
Joe Fernandez
96eecf4f06 am d942d4e9: am 15edcda5: docs: migrate Android TV games page to TV training section 
* commit 'd942d4e93b8e3f7fecab1bee2ae41b0fc69d940c':
  docs: migrate Android TV games page to TV training section
 2014-10-13 04:49:36 +00:00
Joe Fernandez
d942d4e93b am 15edcda5: docs: migrate Android TV games page to TV training section 
* commit '15edcda56ba12ad04a286f4d07f2b6fe0b1c5e38':
  docs: migrate Android TV games page to TV training section
 2014-10-13 04:45:34 +00:00
Joe Fernandez
15edcda56b docs: migrate Android TV games page to TV training section 
Change-Id: Ic6be9deaac5ad2516dba288c0c3d059e3c7a6118
 2014-10-12 21:38:05 -07:00
Joe Fernandez
57383710c8 am 4fd3cd14: am f0acbc15: am e6b9abb3: docs: migrate Android TV content discovery 
* commit '4fd3cd14936d38f3dcc55e08a1a1a3273510685d':
  docs: migrate Android TV content discovery
 2014-10-13 04:07:03 +00:00
Joe Fernandez
4fd3cd1493 am f0acbc15: am e6b9abb3: docs: migrate Android TV content discovery 
* commit 'f0acbc154d1b31240ea8a4b21186667c7dcbf897':
  docs: migrate Android TV content discovery
 2014-10-13 04:01:02 +00:00
Joe Fernandez
f0acbc154d am e6b9abb3: docs: migrate Android TV content discovery 
* commit 'e6b9abb3ad06d32e76a07e733e0a6554479fbfa4':
  docs: migrate Android TV content discovery
 2014-10-13 03:56:42 +00:00
Joe Fernandez
1a3ae15568 am 25b9e363: am bb8e826c: am f666355b: docs: migrate TV Playback app content 
* commit '25b9e36372c37cc74f5ce04f3ae8c7f7ece3dc68':
  docs: migrate TV Playback app content
 2014-10-13 03:55:57 +00:00
Joe Fernandez
25b9e36372 am bb8e826c: am f666355b: docs: migrate TV Playback app content 
* commit 'bb8e826c299e0ca3c83d8befeaa8f64becbf5acc':
  docs: migrate TV Playback app content
 2014-10-13 03:51:07 +00:00
Joe Fernandez
e6b9abb3ad docs: migrate Android TV content discovery 
Change-Id: I35fe1e7f4f60409a0f7c5cd5bfc8ccfede4d6c20
 2014-10-12 20:45:47 -07:00
Joe Fernandez
bb8e826c29 am f666355b: docs: migrate TV Playback app content 
* commit 'f666355b2d9dbffffa640aff7731a8ba8309eaaa':
  docs: migrate TV Playback app content
 2014-10-13 03:29:40 +00:00
Jinsuk Kim
5ddae6ac3d am 8ea712f4: Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev 
* commit '8ea712f44b67bd4be68b5030f5502af17e9d7f58':
  CEC: Do not publish the service if native/HAL is not ready
 2014-10-13 02:46:40 +00:00
Jinsuk Kim
8ea712f44b Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev 2014-10-13 02:41:48 +00:00
Jinsuk Kim
6f87b4e6b6 CEC: Queue actions for starting later when not ready 
Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17933899
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7
 2014-10-13 11:38:16 +09:00
Joe Fernandez
f666355b2d docs: migrate TV Playback app content 
Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
 2014-10-12 19:06:55 -07:00
Jinsuk Kim
08f1ab02d6 CEC: Do not publish the service if native/HAL is not ready 
This helps detect the issue sooner by checking the availability
of the service and avoid crashing at a later point.

Bug: 17897529
Change-Id: Iab0eeffb00221e5a7e6e36d446eeef7c92da1f82
 2014-10-13 10:44:50 +09:00
Joe Fernandez
f04d65f708 am 62d8c4b0: am fd74a901: am d86a2f5b: docs: Android TV App Dev Basic Training 
* commit '62d8c4b06ce62866d05232e15dc97159193d2465':
  docs: Android TV App Dev Basic Training
 2014-10-13 00:49:11 +00:00
Joe Fernandez
62d8c4b06c am fd74a901: am d86a2f5b: docs: Android TV App Dev Basic Training 
* commit 'fd74a901f7ba78b618e1033fdc71af6f7f38bf0c':
  docs: Android TV App Dev Basic Training
 2014-10-13 00:41:59 +00:00
Joe Fernandez
fd74a901f7 am d86a2f5b: docs: Android TV App Dev Basic Training 
* commit 'd86a2f5b344a6c3520ab05c02df8a5b3fdfa5aea':
  docs: Android TV App Dev Basic Training
 2014-10-13 00:35:17 +00:00
Joe Fernandez
d86a2f5b34 docs: Android TV App Dev Basic Training 
Change-Id: Iede448652efba25c3d0b6c26d49ea6548008515e
 2014-10-12 17:29:44 -07:00
Joe Fernandez
e26c4d2f90 docs: Move the L-Developer Preview samples page to the Developer Samples area 
Change-Id: I307acca1dd3105768ed5c72995b1c7e67bea0612
 2014-10-12 11:33:04 -07:00
Ihab Awad
28388edbe7 am 6d39d669: am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)" 
* commit '6d39d66900744afbd0d4388f1a14c9b47d1f1d1a':
  Revert "Add color to PhoneAccount objects (1/3)"
 2014-10-12 12:28:01 +00:00
Ihab Awad
6d39d66900 am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)" 
* commit 'f5afb4d617d591225cc504b52ba9b6f1605a5c87':
  Revert "Add color to PhoneAccount objects (1/3)"
 2014-10-12 04:33:12 +00:00
Ihab Awad
f5afb4d617 Revert "Add color to PhoneAccount objects (1/3)" 
This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.
 2014-10-11 17:16:39 -07:00
Dianne Hackborn
ce00f22f26 am ec941de2: am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'ec941de2fc2a96e6924d11de3168c14ae8af1ac4':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 03:18:09 +00:00
Amit Mahajan
7c2b29ac45 am 1ea2aeda: am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 
* commit '1ea2aeda29a247de56e7991d16a4ae12d9aff8f1':
  Fix to show low LTE signal strength as -140 instead of 0.
 2014-10-11 03:18:04 +00:00