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

96518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Dixon
47aaba3faf Fix broken more JavaDoc links 
Change-Id: Ic1c74c739a668871e37b7b5868f1bc9ed3a65828
 2012-11-30 16:32:17 -08:00
Jonathan Dixon
7c28219cc9 Fix broken JavaDoc 
Change-Id: I1e6d595f0fcd1a816ed39aaa801f7d451eb39f85
 2012-11-30 15:53:28 -08:00
Romain Guy
dccf9337e6 Merge "Add support for face attribute to HTML string resources Bug #7480719" 2012-11-27 14:35:24 -08:00
Romain Guy
a8f6d5f072 Add support for face attribute to HTML string resources 
Bug #7480719

This change also adds the alias "color" for the attribute "fgcolor".
This change also unifies HTML colors parsing between the Html class
and StringBlock for consistency.

Change-Id: I696a6e080387901d88e9baf7cb989b892f14b9db
 2012-11-27 14:34:33 -08:00
Romain Guy
498486e002 Merge "Reset stored background resource when setting a bg color" 2012-11-27 14:10:24 -08:00
Romain Guy
f6ae4b897b Reset stored background resource when setting a bg color 
This sequence of operations would prevent the background from
changing:

setBackgroundResource(R.something)
setBackgroundColor(aColor)
setBackgroundResource(R.something)

The last call would be no-oped.

Change-Id: I436a33599c88e35f6f36bdd63e9c256c9219e052
 2012-11-27 13:57:27 -08:00
Romain Guy
62d3a7b793 Merge "Undeprecate linear text API" 2012-11-27 13:37:29 -08:00
Romain Guy
a1dcc992ff Undeprecate linear text API 
Hardware renderer support pending, but this API should not have
been deprecated in the first place.

Change-Id: I062dac6d65dffb5369e65d55ea159594a0971b59
 2012-11-27 13:35:49 -08:00
Baligh Uddin
84af4dae23 Merge "Import translations. DO NOT MERGE" 2012-11-27 13:29:25 -08:00
Baligh Uddin
01518f484c Merge "Import translations. DO NOT MERGE" 2012-11-27 13:28:12 -08:00
Baligh Uddin
d5c11daa53 Import translations. DO NOT MERGE 
Change-Id: I830962076909bd65156b0e56bc8b9a4f44b7b249
Auto-generated-cl: translation import
 2012-11-27 13:00:43 -08:00
Baligh Uddin
f996ff5119 Import translations. DO NOT MERGE 
Change-Id: Ibacc28b5d82bcc429238cbd86251573855509285
Auto-generated-cl: translation import
 2012-11-27 13:00:14 -08:00
Baligh Uddin
6f65b352a4 Import translations. DO NOT MERGE 
Change-Id: If8c2f4d122f4f99ac8af2912be919f8345b17410
Auto-generated-cl: translation import
 2012-11-27 12:54:58 -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