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

154907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
ec941de2fc am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'eddb2b3805d323ad1b6e1a09f2e64736b2eb2cf4':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 02:50:12 +00:00
Amit Mahajan
1ea2aeda29 am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 
* commit '589a4896b0c45f03604db1eb0292ef1c936adaff':
  Fix to show low LTE signal strength as -140 instead of 0.
 2014-10-11 02:50:08 +00:00
Alan Viverette
1eeec4e4ea am 3bb0b296: am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev 
* commit '3bb0b2964df28a17999a53a4b3c7667f81a58506':
  Add Cutive Mono as serif monospace font for captioning
 2014-10-11 02:50:03 +00:00
Ihab Awad
d410a2f4ee am a516e445: Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev 
* commit 'a516e445651724da3a833d08540c42fabe4f34b7':
  Add color to PhoneAccount objects (1/3)
 2014-10-11 02:49:21 +00:00
Dianne Hackborn
eddb2b3805 am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev 
* commit 'bbbeafa9bf0c4598b32c615c72e2c87ef62c85e9':
  Fix issue #17829949: Don't kill Bluetooth service...
 2014-10-11 00:29:53 +00:00
Amit Mahajan
589a4896b0 am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 
* commit 'c6c18618e999f24675e23b67e6c488d700199579':
  Fix to show low LTE signal strength as -140 instead of 0.
 2014-10-11 00:24:13 +00:00
Alan Viverette
3bb0b2964d am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev 
* commit '99cc35bbde7415fcdeada6fb4243097af85ae33f':
  Add Cutive Mono as serif monospace font for captioning
 2014-10-11 00:24:03 +00:00
Dianne Hackborn
bbbeafa9bf Merge "Fix issue #17829949: Don't kill Bluetooth service..." into lmp-dev 2014-10-11 00:17:46 +00:00
Alan Viverette
284559bfb8 Merge "Fix inset drawable's intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev 2014-10-11 00:14:27 +00:00
Amit Mahajan
c6c18618e9 Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev 2014-10-11 00:07:19 +00:00
Amit Mahajan
b5c78682ad Fix to show low LTE signal strength as -140 instead of 0. 
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
 2014-10-10 17:05:46 -07:00
Alan Viverette
99cc35bbde Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev 2014-10-10 23:41:17 +00:00
Ihab Awad
a516e44565 Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev 2014-10-10 23:02:12 +00:00
Selim Cinek
3b0169aec3 am a07421c6: am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit 'a07421c6dbcc1e34d9c91a416cf0dd2255c79701':
  Fixed missing translation for wallpaper cropper
 2014-10-10 22:53:58 +00:00
George Mount
e6308c7eb2 am 52fb8a42: am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 
* commit '52fb8a4245aad87972bb6b52697fcd2dd111fe99':
  Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
 2014-10-10 22:53:47 +00:00
Jerome Dochez
0757e5fd6d am c9c512e0: am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'c9c512e0ff2faf86eb544bf175a1d177f9b7ba6d':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 22:53:16 +00:00
Selim Cinek
b7981719b0 am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '5c401a0e0bf3b5f647f7f1791e10195f748bfe96':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 22:53:07 +00:00
Christopher Tate
f1178b23ac am 2c15bbc8: am 1133e29f: Tweak wallpaper restore rejection threshold 
* commit '2c15bbc8382ac7e5f04d149c8f576261f1dca334':
  Tweak wallpaper restore rejection threshold
 2014-10-10 22:52:57 +00:00
Jinsuk Kim
62ba538b94 resolved conflicts for merge of 3170c035 to lmp-mr1-dev 
Change-Id: Ia34a304451f0dd7148d6d0cbd1d8c8ca81001b86
 2014-10-11 07:23:18 +09:00
Dianne Hackborn
ce09f5a53c Fix issue #17829949: Don't kill Bluetooth service... 
...even in extreme low memory condition

Bind to Bluetooth with BIND_IMPORTANT, so that it is allowed to
go to a higher oom adj level.

Fix some problems when this is done from a system or persistent
process, where this would go to a level that is *too* high.  Instead,
introduce a new oom adj level for it that is right below persistent.

Change-Id: I002bcc4accc36c8579c4cda161be7d2fba21ba17
 2014-10-10 15:05:33 -07:00
Selim Cinek
a07421c6db am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit '2c461def93f235d3a7853851ee125cb3caaf2955':
  Fixed missing translation for wallpaper cropper
 2014-10-10 21:18:32 +00:00
Selim Cinek
2c461def93 Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 2014-10-10 21:14:34 +00:00