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

96542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Satoshi Kataoka
48d3111ef1 am c86ae7cf: am 1c37b800: am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit 'c86ae7cf318f6c9d8cf581447e8897fbc1245ef3':
  Hide current soft input when a background user gains window focus.
 2012-11-27 17:34:02 -08:00
Svetoslav Ganov
e44a51ba10 am 30913478: am 37eaac1d: am de0bf8bc: am abb4a700: Update the content shell command\'s usage instructions. 
* commit '30913478b083de92e75755adef3b8a32a3cb2fd5':
 2012-11-27 17:33:58 -08:00
Amith Yamasani
7f9ac6461f am 83965c80: am eb933360: am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit '83965c80a2c7d574a6f2a056383278270ac42dd0':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 17:33:54 -08:00
Winson Chung
fb8ca912e8 am d0079891: am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit 'd0079891e3a8034f560eaf88d5be692b61ca4b9a':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 17:33:46 -08:00
Michael Jurka
74789bb336 am d3de7953: am e020af83: am ab972a6d: Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev 
* commit 'd3de79538bc87e769e876866f38b8c9048940d4b':
  Fix bug where icon animation is sometimes skipped
 2012-11-27 17:33:42 -08:00
Tim Murray
8aece09443 Merge "Update JNI for strided 2D copies." 2012-11-27 16:27:50 -08:00
Tim Murray
38faea3019 Update JNI for strided 2D copies. 
Change-Id: I2453af41a3b974bb0b3c6b1c5a506093f2019e70
 2012-11-27 14:56:34 -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
Satoshi Kataoka
c86ae7cf31 am 1c37b800: am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit '1c37b8000999c98e8cb5fe76c1f52d204f901783':
  Hide current soft input when a background user gains window focus.
 2012-11-27 11:36:25 -08:00
Svetoslav Ganov
30913478b0 am 37eaac1d: am de0bf8bc: am abb4a700: Update the content shell command\'s usage instructions. 
* commit '37eaac1da43f941dac778cb9bd16cde2612a1c3a':
 2012-11-27 11:36:21 -08:00
Amith Yamasani
83965c80a2 am eb933360: am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit 'eb933360ee4249a453d2df4b77fbab0179abee2e':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 11:36:17 -08:00
Winson Chung
d0079891e3 am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit '9f6e8ddf5d48a695b26f1d9759696b56952177bd':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 11:36:13 -08:00
Michael Jurka
d3de79538b am e020af83: am ab972a6d: Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev 
* commit 'e020af835b147e35ebf683957a8c1a5e52442d69':
  Fix bug where icon animation is sometimes skipped
 2012-11-27 11:36:09 -08:00
Satoshi Kataoka
1c37b80009 am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit '1af084113713743c70df04702083fff5a5325482':
  Hide current soft input when a background user gains window focus.
 2012-11-27 11:31:26 -08:00
Svetoslav Ganov
37eaac1da4 am de0bf8bc: am abb4a700: Update the content shell command\'s usage instructions. 
* commit 'de0bf8bc2c9814e255b45abf0453260fff5ebffa':
  Update the content shell command's usage instructions.
 2012-11-27 11:31:21 -08:00
Amith Yamasani
eb933360ee am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit '7be52cbc33157e4700b7d04e69d1149cd80e9096':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 11:31:14 -08:00
Winson Chung
9f6e8ddf5d am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit '2b847c39336024a958742195de4f406e7aa79540':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 11:31:03 -08:00
Michael Jurka
e020af835b am ab972a6d: Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev 
* commit 'ab972a6dce0d3d75fa9db2b5f9c0a88505e237fd':
  Fix bug where icon animation is sometimes skipped
 2012-11-27 11:30: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
Satoshi Kataoka
1af0841137 Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 2012-11-26 19:39:20 -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
Svetoslav Ganov
de0bf8bc2c am abb4a700: Update the content shell command\'s usage instructions. 
* commit 'abb4a7008a1f5eab6cfaf7e9dd4779e549c21714':
  Update the content shell command's usage instructions.
 2012-11-26 17:22:40 -08:00
Jonathan Dixon
425c3da61a Fix typo in exception message 
Change-Id: I85390d7ceae8f89aadd808600a920a1401ef1c3a
 2012-11-26 17:22:08 -08:00
Amith Yamasani
7be52cbc33 Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 2012-11-26 16:22:41 -08:00