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

180161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Hung
84a6d9e609 Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers" 2015-01-16 00:21:17 +00:00
Mike Lockwood
61369de03e Merge "MidiManager bug fixing:" 2015-01-16 00:09:57 +00:00
Mike Lockwood
98cc8e5a64 MidiManager bug fixing: 
- fix off by one error that caused failure handling one byte messages

- poll thread now terminates properly in UsbMidiDevice

- fix cleanup logic in MidiDeviceServer

Change-Id: I0c13a98b6542cfb271b51678e81d1822c8da2985
 2015-01-15 16:07:28 -08:00
Geoff Mendal
58b859163c am 6ba9c529: (-s ours) am d3403e45: (-s ours) am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '6ba9c529fda8aba5f1157b4ff3feb1a494e673ad':
  Import translations. DO NOT MERGE
 2015-01-16 00:06:36 +00:00
Craig Mautner
c62d355b3f am b523c55d: am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit 'b523c55d76ef3215538158a65bdea70c9897993e':
  Debug for bug 18201239.
 2015-01-16 00:06:29 +00:00
Chris Craik
d5049e2f74 am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '04b633c526b3ea72cb13f0c0472673f3baf07625':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-16 00:06:14 +00:00
Alan Viverette
f6e92936c7 am 78dfb182: am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '78dfb182d29259630277ee40d51c7350df1e7dac':
  Ensure scroll assets are drawn with correct opacity
 2015-01-16 00:05:51 +00:00
Eric Laurent
1eadf93d99 am c3fb94ca: am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit 'c3fb94caf0d5a4b8f6a3c9bbc6ce31cbfd0ef2f0':
  AudioManager: make AudioPortEventHandler static
 2015-01-16 00:05:38 +00:00
Eino-Ville Talvala
950597d032 am 31028fa6: am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '31028fa621b0f182f39b1f6d391963e8e6f627fe':
  Camera: Clarify JNI exception message
 2015-01-16 00:05:04 +00:00
Geoff Mendal
6ba9c529fd am d3403e45: (-s ours) am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd3403e45d6d89d0307c0fc9427cc84792ac6ee83':
  Import translations. DO NOT MERGE
 2015-01-15 23:51:22 +00:00
Geoff Mendal
d3403e45d6 am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a':
  Import translations. DO NOT MERGE
 2015-01-15 23:45:54 +00:00
Geoff Mendal
faf92d7256 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-15 23:39:49 +00:00
Todd Kennedy
28432f0360 Merge "Rename the binder call createActivityContainer" 2015-01-15 23:37:22 +00:00
Craig Mautner
b523c55d76 am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '41d54237380d5f3c06ab2a71715e22f048278ecf':
  Debug for bug 18201239.
 2015-01-15 23:30:41 +00:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Todd Kennedy
ca4d842205 Rename the binder call createActivityContainer 
Change the call to createVirtualActivityContainer to better describe what's
actually being created with the call.

Change-Id: Id3a32df19a5bb6740cbabcd65897349e9f2f2946
 2015-01-15 15:22:17 -08:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Chris Craik
04b633c526 am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:15:56 +00:00
Geoff Mendal
116f90c895 Import translations. DO NOT MERGE 
Change-Id: I4580b358133cd261985459a26a1c4bc36a14d630
Auto-generated-cl: translation import
 2015-01-15 15:14:15 -08:00
Chris Craik
0de2eca5fc am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '112e35b4641a1a8cad3616c8209ab47f03f9ab67':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:08:11 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Alan Viverette
3c8e3a96e9 Merge "Add popup theme for Spinner, use for actionBarPopupTheme default" 2015-01-15 22:50:26 +00:00
Alan Viverette
3355414b09 Merge "Allow views to be positioned relative to baseline-aligned views" 2015-01-15 22:48:59 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
78dfb182d2 am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit 'dbe54533499571f34ddc126ea21379932ea1d6d7':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:37:40 +00:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
14af813940 Merge "Update radial time picker styling, clean up code" 2015-01-15 22:27:54 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00
Eric Laurent
c3fb94caf0 am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '4772f8b841dc1ad50999e2cca3f1d366b325b915':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:21:58 +00:00
Luan Nguyen
bad68bcf39 am 34a1a10d: am b47cf562: am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit '34a1a10d51af331be139849c6c0ada109bc64a63':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 22:17:50 +00:00
Roozbeh Pournader
60f8df9339 am a601d44b: am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit 'a601d44baa4ff21d3888dd624c016dc07c5ff937':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 22:17:35 +00:00
Eric Laurent
4772f8b841 am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 
* commit '16cfa8ddfd6c18577f5d38e545597a63889d9779':
  AudioManager: make AudioPortEventHandler static
 2015-01-15 22:16:28 +00:00
Eric Laurent
16cfa8ddfd Merge "AudioManager: make AudioPortEventHandler static" into lmp-mr1-dev 2015-01-15 22:10:53 +00:00
Alan Viverette
03748a5707 Ensure scroll assets are drawn with correct opacity 
Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
 2015-01-15 13:00:21 -08:00
Eino-Ville Talvala
31028fa621 am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '1334a6f34296094baddc0d4c0c93357532b2a96d':
  Camera: Clarify JNI exception message
 2015-01-15 20:13:11 +00:00
Eino-Ville Talvala
1334a6f342 am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 
* commit '8d47bc97e642cd0d0caf31d09efe05d8dc233f27':
  Camera: Clarify JNI exception message
 2015-01-15 20:06:34 +00:00
Eino-Ville Talvala
8d47bc97e6 Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev 2015-01-15 20:00:02 +00:00
Scott Kennedy
db5fd42a03 Mark the root argument as @Nullable in LayoutInflater#inflate() 
Change-Id: I174ff06268ece7a47ce22c98eb0377fa1b5a4a36
 2015-01-15 11:56:33 -08:00
Scott Kennedy
069db2ae23 Merge "Add @Nullable annotation where necessary in Rfc822Token" 2015-01-15 19:52:28 +00:00
Luan Nguyen
34a1a10d51 am b47cf562: am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'b47cf562bbbc08e45a6ae38e1ae98a36e6928caf':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:47:32 +00:00
Luan Nguyen
b47cf562bb am e184b2f2: am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'e184b2f2355e572fa67e748e625e4eea0ac29201':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:42:21 +00:00
Luan Nguyen
e184b2f235 am d5a114cd: am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd5a114cd0e15bdd263bfd9704bdfeacd28dfe670':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:36:35 +00:00
Ben Wagner
d7fcd28f5d Merge "Remove last mention of SkFontHost." 2015-01-15 19:33:37 +00:00
Luan Nguyen
d5a114cd0e am d3cc11a1: docs: Remove reference to handheld app for bitmap resource locations. 
* commit 'd3cc11a1647c2aa9d830c1538e6a3b1355c9ca1f':
  docs: Remove reference to handheld app for bitmap resource locations.
 2015-01-15 19:30:08 +00:00
Roozbeh Pournader
a601d44baa am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit 'a4d1e25000195b2349cb29e389d1ded4b23dc7a6':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:21:01 +00:00
Ben Wagner
177612335a Remove last mention of SkFontHost. 
SkFontHost is now almost removed from Skia, and nothing is left in it
which interests Android. Remove the last few references to it to aid
in final removal.

Change-Id: I7d59cf7e08bdd5b9c3923c9ffaf03b1cc2f9f7b4
 2015-01-15 14:16:46 -05:00
Roozbeh Pournader
a4d1e25000 am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit '9787039d91ad23805a1e73e1cd973b85295b85c2':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:10:33 +00:00
Roozbeh Pournader
9787039d91 Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 2015-01-15 18:56:08 +00:00
Chet Haase
e1039c6f83 Merge "Add resource attributes for Keyframes and PropertyValuesHolders" 2015-01-15 18:53:36 +00:00
Scott Kennedy
adc6b85072 Add @Nullable annotation where necessary in Rfc822Token 
Change-Id: I9b3088cbdfa09a8085b525674ff2540f23d4c96e
 2015-01-15 10:50:31 -08:00