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

153857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
8ca4886e43 am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:48:11 +00:00
Michael Wright
43a7dcc12b am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev 
* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
  Clean-up ColorFade's shaders and buffers.
 2014-10-13 18:48:07 +00:00
Geoff Mendal
ad12f288b1 am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '02c4a225ffa32e67255517a0275d7a4c1a738619':
  Import translations. DO NOT MERGE
 2014-10-13 18:48:03 +00:00
Mike Lockwood
317f9ce85a Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 2014-10-13 18:38:23 +00:00
Geoff Mendal
1b77f365d6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-13 17:31:34 +00:00
Michael Wright
265d3e9d3e Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev 2014-10-13 17:30:32 +00:00
Geoff Mendal
02c4a225ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-13 17:22:40 +00:00
Geoff Mendal
aaefa5963e Import translations. DO NOT MERGE 
Change-Id: I089e715e2d5e9c3533ddfbcd9a8773e5d4badd86
Auto-generated-cl: translation import
 2014-10-13 10:15:50 -07:00
Geoff Mendal
84323907e4 Import translations. DO NOT MERGE 
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
 2014-10-13 10:05:28 -07:00
Mike Lockwood
6e383350e4 Change RECEIVE_BLUETOOTH_MAP permission to signature or system 
Bug: 17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
 2014-10-13 10:00:08 -07: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
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
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
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
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
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
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
Joe Fernandez
f666355b2d docs: migrate TV Playback app content 
Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868
 2014-10-12 19:06:55 -07: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
f5afb4d617 Revert "Add color to PhoneAccount objects (1/3)" 
This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.
 2014-10-11 17:16:39 -07: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
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
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
Selim Cinek
b7cde675a2 Fixed missing translation for wallpaper cropper 
Also a fixed a small visibility issue.

Bug: 17927204
Change-Id: Ia9566fe8fe0c70f83edc295b0bf8317e94eb85fe
 2014-10-10 13:55:36 -07:00
George Mount
52fb8a4245 am 1a285496: Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 
* commit '1a285496fb504d4c4d41e97a7c3b67210c1a67ef':
  Allow using setLeft/Top/Right/Bottom to control ChangeBounds.
 2014-10-10 20:52:22 +00:00
George Mount
1a285496fb Merge "Allow using setLeft/Top/Right/Bottom to control ChangeBounds." into lmp-dev 2014-10-10 20:48:10 +00:00
George Mount
5ac9b20b41 Allow using setLeft/Top/Right/Bottom to control ChangeBounds. 
Bug 17938614

Change-Id: Ia341fdd63ab57ec16a3de6349b7eb07fdc0a48ae
 2014-10-10 13:22:36 -07:00
Alan Viverette
4f9140b52c Add Cutive Mono as serif monospace font for captioning 
Sets up Courier and Courier New to point to Cutive Mono, since
Courier is a serif monospace font.

BUG: 17666124
Change-Id: I96bb2ff59020edd8210c253752f76f0eb5100e18
 2014-10-10 12:52:25 -07:00
Jerome Dochez
c9c512e0ff am f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 
* commit 'f47f8855175213b4bf1014593f97bc81c042dfd1':
  Added a daemon mode to aapt to receive streams of commands from gradle.
 2014-10-10 19:24:48 +00:00
Jerome Dochez
f47f885517 Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev 2014-10-10 19:21:49 +00:00
Selim Cinek
5c401a0e0b am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '3e683b6a0f40e176ba9ffce652939ecef23b9dc2':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 18:53:10 +00:00
Selim Cinek
3e683b6a0f Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 2014-10-10 18:49:12 +00:00