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

96506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
599a90c2a0 Use Rlog instead of Log 
Change-Id: I2332f4210ead8a6d751fc9c0505db25033641da2
 2012-11-27 12:29:13 -08:00
Irfan Sheriff
b637322fd0 am a80b9954: am 10c29234: am 13fd8919: Merge "Fixed typo and space." 
* commit 'a80b9954a4e68700030e0c1718a82f3433074037':
  Fixed typo and space.
 2012-11-27 11:27:25 -08:00
Irfan Sheriff
a80b9954a4 am 10c29234: am 13fd8919: Merge "Fixed typo and space." 
* commit '10c29234aa3494bee7cade0412fb0743b5a0f0ad':
  Fixed typo and space.
 2012-11-27 11:24:16 -08:00
Irfan Sheriff
10c29234aa am 13fd8919: Merge "Fixed typo and space." 
* commit '13fd8919bd3e1a314cf00a3e9299dbcac8c3cd7f':
  Fixed typo and space.
 2012-11-27 11:21:46 -08:00
Romain Guy
f6e7b2089d Merge "Add new mipMap attribute to BitmapDrawable" 2012-11-27 11:04:57 -08:00
Romain Guy
5769fcd88a Add new mipMap attribute to BitmapDrawable 
This attribute can be used to enable/disable mipmapping on bitmaps.
See Bitmap.setHasMipMap() for details.

Change-Id: I13cc800a258b6876a94e2a9605dcec4ea4f1ea48
 2012-11-27 11:03:22 -08:00
Irfan Sheriff
13fd8919bd Merge "Fixed typo and space." 2012-11-27 10:39:26 -08:00
Chris Craik
86ee9f375a Merge "Hardware / Software Canvas comparison tool" 2012-11-27 10:13:25 -08:00
Chet Haase
62d3fd89ec am 161194da: am d8a6b544: am 21243369: Merge "Fix infinite recursive loop" 
* commit '161194daad7cee031475648be294e5e9d4bc6d68':
  Fix infinite recursive loop
 2012-11-27 09:41:16 -08:00
Chet Haase
161194daad am d8a6b544: am 21243369: Merge "Fix infinite recursive loop" 
* commit 'd8a6b5445c070e1ab5d86a87e6669340591625d7':
  Fix infinite recursive loop
 2012-11-27 09:39:16 -08:00
Chet Haase
d8a6b5445c am 21243369: Merge "Fix infinite recursive loop" 
* commit '2124336984cb6c189f03c271636a1cc8babb2371':
  Fix infinite recursive loop
 2012-11-27 09:37:23 -08:00
Chet Haase
2124336984 Merge "Fix infinite recursive loop" 2012-11-27 08:34:18 -08:00
The Android Open Source Project
dc9f653a3c am 17f9e778: (-s ours) am 5132d626: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge 
* commit '17f9e778a5f22bce8df9bed83b9b0d7abf72e9a9':
  Update the content shell command's usage instructions.
 2012-11-27 08:25:03 -08:00
The Android Open Source Project
17f9e778a5 am 5132d626: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge 
* commit '5132d62600484bb4fce86295b288c782bee91de8':
  Update the content shell command's usage instructions.
 2012-11-27 08:22:34 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
Przemyslaw Szczepaniak
2d940bcbd1 Make TTS input string limit public and documented. 
TTS input limit is now publicly available from getMaxSpeechInputLength()
static method.

Bug: 7456118
Change-Id: Ib2afbb7202ad9dc15895f322fbd1480a5f1f7278
 2012-11-27 03:25:27 -08:00
Jason Sams
fdb36725ac Merge "Add single channel blur test." 2012-11-26 18:18:04 -08:00
Scott Kennedy
b23858c077 Merge "Unhide SparseLongArray" 2012-11-26 17:58:31 -08:00
Scott Kennedy
c40d1153e0 Unhide SparseLongArray 
Because it's useful.

Change-Id: I6c71a49eed2c0c366e8afa874ebbc48cfe816a90
 2012-11-26 17:51:04 -08:00
Jonathan Dixon
425c3da61a Fix typo in exception message 
Change-Id: I85390d7ceae8f89aadd808600a920a1401ef1c3a
 2012-11-26 17:22:08 -08:00
Romain Guy
34583fcb9a Merge "Clarify Bitmap.copyTo/FromPixelBuffer documentation" 2012-11-26 12:09:54 -08:00
Romain Guy
1f58497e7d Clarify Bitmap.copyTo/FromPixelBuffer documentation 
Change-Id: Ifb410df392a5ad6c83d6744e19aad13b9a4e811d
 2012-11-26 12:06:39 -08:00
Winson Chung
26c8a8c912 am e41ea2c0: am 037e8ee2: am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit 'e41ea2c0888964a5feb5836260f7f93cd36e0a8f':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:53:00 -08:00
Winson Chung
e41ea2c088 am 037e8ee2: am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit '037e8ee26f9fa6e2f30d9501a4db43161904c905':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:50:59 -08:00
Winson Chung
037e8ee26f am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit '9a0fbd4c6da2905504defdba9843d3fcbe0c1367':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:49:30 -08:00
Winson Chung
9a0fbd4c6d Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 2012-11-26 11:46:39 -08:00
Craig Mautner
f4f35f8e8d am 1ee927f4: am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 
* commit '1ee927f42bea9817fc16d5ee6532ce46e099f4b4':
  Ignore invalid combination of PowerManager flags.
 2012-11-26 11:45:25 -08:00
Daniel Sandler
41886ecf33 am 90e3dfa5: am b4a63987: am 53d96599: Merge "Allow long-press on Wifi and Bluetooth tiles to toggle." into jb-mr1.1-dev 
* commit '90e3dfa55c52f202f3d5a54d915fdd1ddb3cd47a':
  Allow long-press on Wifi and Bluetooth tiles to toggle.
 2012-11-26 11:43:42 -08:00
Craig Mautner
1ee927f42b am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 
* commit '8de91ce1e037408064f453b26f1fe725cd6377e3':
  Ignore invalid combination of PowerManager flags.
 2012-11-26 11:43:28 -08:00
Daniel Sandler
90e3dfa55c am b4a63987: am 53d96599: Merge "Allow long-press on Wifi and Bluetooth tiles to toggle." into jb-mr1.1-dev 
* commit 'b4a639876917a5f7e0cbde6b55b4c62286200ea2':
  Allow long-press on Wifi and Bluetooth tiles to toggle.
 2012-11-26 11:41:49 -08:00
Craig Mautner
8de91ce1e0 am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 
* commit '7f2a98967532138f3f962216ccf2d1a8307d42de':
  Ignore invalid combination of PowerManager flags.
 2012-11-26 11:41:17 -08:00
Daniel Sandler
b4a6398769 am 53d96599: Merge "Allow long-press on Wifi and Bluetooth tiles to toggle." into jb-mr1.1-dev 
* commit '53d96599788a21867887422ed140dc9a6dd8919d':
  Allow long-press on Wifi and Bluetooth tiles to toggle.
 2012-11-26 11:39:29 -08:00
Winson Chung
4752e7d1a9 Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782) 
- Also adding feedback on the plus page (Bug 7500328)

Change-Id: Iddd09b7a3d5347a43bc040052114879cbaecccd9
 2012-11-26 11:36:40 -08:00
Craig Mautner
625ac3086a Merge "Retain dimming while animating and obscured." 2012-11-26 11:35:31 -08:00
Craig Mautner
7f2a989675 Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 2012-11-26 11:34:40 -08:00
Daniel Sandler
53d9659978 Merge "Allow long-press on Wifi and Bluetooth tiles to toggle." into jb-mr1.1-dev 2012-11-26 11:33:06 -08:00
Chet Haase
d9c9f894b9 am cae3eb91: am 946facaa: am a004ff88: Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev 
* commit 'cae3eb91e159a48e2b4ec9ee6339a40212435c2f':
  Use correct alpha value when a color is not set on a GradientDrawable.
 2012-11-26 11:20:39 -08:00
Chet Haase
cae3eb91e1 am 946facaa: am a004ff88: Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev 
* commit '946facaae149b4408b9b79d2804f4ee2e80c849b':
  Use correct alpha value when a color is not set on a GradientDrawable.
 2012-11-26 10:24:55 -08:00
Chet Haase
946facaae1 am a004ff88: Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev 
* commit 'a004ff880e103832af4ba069e7176c18b96b62d9':
  Use correct alpha value when a color is not set on a GradientDrawable.
 2012-11-26 10:23:02 -08:00
Chet Haase
a004ff880e Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev 2012-11-26 10:20:30 -08:00
Romain Guy
458bf39e4c am 713bebda: am 6225b881: am 18bbcf7f: Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev 
* commit '713bebdac508bb8e6fb0866f4cae873806dad459':
  Copy missing state in DrawableContainer
 2012-11-26 09:51:44 -08:00
Romain Guy
8508d7ef63 am eb673855: am f57eaa02: am ce180c10: Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev 
* commit 'eb673855a2204e81108bfe3f481a32a347b61db9':
  Cleanup: add PointF.toString()/equals()/hashcode()
 2012-11-26 09:51:40 -08:00
Svetoslav Ganov
abb4a7008a Update the content shell command's usage instructions. 
The usage instructions of the content shell command were missing some
excape charecters which caused the examples not to work. As a result
of the incorrect instructions users are prone to constructing incorrect
commands.

bug:7526252

Change-Id: I2fcc4dd1fd05806fe951245651b97e40a4786d24
 2012-11-26 09:50:51 -08:00
Romain Guy
713bebdac5 am 6225b881: am 18bbcf7f: Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev 
* commit '6225b881875e2ae3f84b7fa2e9e090f018f32972':
  Copy missing state in DrawableContainer
 2012-11-26 09:49:54 -08:00
Romain Guy
eb673855a2 am f57eaa02: am ce180c10: Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev 
* commit 'f57eaa02ea00e538d3d5dc2b4a39831ac3e07db8':
  Cleanup: add PointF.toString()/equals()/hashcode()
 2012-11-26 09:49:51 -08:00
Romain Guy
6225b88187 am 18bbcf7f: Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev 
* commit '18bbcf7f688be41d858b2ac2dd51e7d86371aecb':
  Copy missing state in DrawableContainer
 2012-11-26 09:47:27 -08:00
Romain Guy
f57eaa02ea am ce180c10: Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev 
* commit 'ce180c10f702d42b9f443b6a6ba7b0acaa5598ef':
  Cleanup: add PointF.toString()/equals()/hashcode()
 2012-11-26 09:47:23 -08:00
Romain Guy
18bbcf7f68 Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev 2012-11-26 09:45:29 -08:00
Romain Guy
ce180c10f7 Merge "Cleanup: add PointF.toString()/equals()/hashcode()" into jb-mr1.1-dev 2012-11-26 09:44:28 -08:00
Baligh Uddin
640f170780 am 06b17c53: (-s ours) am a6009edd: am a722789b: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '06b17c53c0be1ec934d2d7813adc7311b9581d29':
  Import translations. DO NOT MERGE
 2012-11-26 09:25:41 -08:00