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

96674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
09a526faf3 Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev 2012-11-27 14:49:41 -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
3ac8060c28 am 9e2783ee: am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '9e2783ee9feeefed644d5524d036ee4cbcb264f4':
  Import translations. DO NOT MERGE
 2012-11-27 13:30:10 -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
9e2783ee9f am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '4df6c6292b9bfa35ece3c09d5094a7f4089c5029':
  Import translations. DO NOT MERGE
 2012-11-27 13:27:27 -08:00
Baligh Uddin
20db55e836 am 346b6a42: am 18a4aa89: am c8d2abd8: Import translations. DO NOT MERGE 
* commit '346b6a42217f43c563405f0112591de2ac8edb49':
  Import translations. DO NOT MERGE
 2012-11-27 13:27:26 -08:00
Baligh Uddin
346b6a4221 am 18a4aa89: am c8d2abd8: Import translations. DO NOT MERGE 
* commit '18a4aa8996891648bc0c9d7a5bed3b3bf28acdec':
  Import translations. DO NOT MERGE
 2012-11-27 13:25:49 -08:00
Baligh Uddin
4df6c6292b Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-27 13:21:26 -08:00
Baligh Uddin
18a4aa8996 am c8d2abd8: Import translations. DO NOT MERGE 
* commit 'c8d2abd81d85b7049837f0dc42310eee64c08d16':
  Import translations. DO NOT MERGE
 2012-11-27 13:20:55 -08:00
Baligh Uddin
a0082a63a6 am 12e9bfd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '12e9bfd677895bee0d2b6f994e5f743d6df834fc':
  Import translations. DO NOT MERGE
 2012-11-27 13:18:54 -08:00
Baligh Uddin
12e9bfd677 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-27 13:15:57 -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
Kenny Root
dfb828a196 am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks" 
* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks
 2012-11-27 13:00:01 -08:00
Kenny Root
ae0edeb3e5 am c88047bf: Merge "Move NTP updates outside locks" 
* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877':
  Move NTP updates outside locks
 2012-11-27 12:57:54 -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
Chet Haase
d8f270a0d3 am 3b2b3aaf: am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 
* commit '3b2b3aaf9f37dd8e971f2846236dc551d5e38666':
  Fix infinite recursive loop DO NOT MERGE
 2012-11-27 12:52:17 -08:00
Chet Haase
3b2b3aaf9f am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 
* commit '47a8e863e32dc634aa1df79d805f4a366e13d4e9':
  Fix infinite recursive loop DO NOT MERGE
 2012-11-27 12:49:16 -08:00
Craig Mautner
e855214249 Retain configuration change info and sync access. 
- If a window was hidden while the configuration changed and then
changed back WindowManagerService would not know that the change
had ever happened and wouldn't notify the window of this. Most
windows wouldn't care but because Keyguard inflates layouts while
it is hidden...

Bug 7094175 fixed?
Bug 7501099 fixed!

Change-Id: If27f5f1d333602dac7719dd39dbdf3fe7954aa06
 2012-11-27 12:47:27 -08:00
Chet Haase
47a8e863e3 Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 2012-11-27 12:47:19 -08:00
Baligh Uddin
d27c81fecc Import translations. DO NOT MERGE 
Change-Id: Iadbc15f54f259bea612b1ec99c1dfd64e1a51674
Auto-generated-cl: translation import
 2012-11-27 12:46:53 -08:00
Baligh Uddin
c8d2abd81d Import translations. DO NOT MERGE 
Change-Id: I1079e1b66c125f8b6044f3502961e11cc7858ba3
Auto-generated-cl: translation import
 2012-11-27 12:45:19 -08:00
Baligh Uddin
86b758f4f3 Import translations. DO NOT MERGE 
Change-Id: Iceeb36fd0bb841e6bca65966a425a2de9d3c4121
Auto-generated-cl: translation import
 2012-11-27 12:43:47 -08:00
Wink Saville
599a90c2a0 Use Rlog instead of Log 
Change-Id: I2332f4210ead8a6d751fc9c0505db25033641da2
 2012-11-27 12:29:13 -08:00
Kenny Root
c88047bf86 Merge "Move NTP updates outside locks" 2012-11-27 11:54:31 -08:00
Adam Powell
bb53dad63b Remove overzealous mutate() sanity check in LayerDrawable 
Child drawables of a LayerDrawable should be able to mutate() as a
no-op even if they !canConstantState.

Bug 7622311

Change-Id: I32c00961310f23aaf9ad868c419cbefb9d27a1d2
 2012-11-27 11:39:11 -08:00
Dianne Hackborn
360acd03bf am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit '78551bc7d5541c86503b32db0e3e2564218bf179':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 11:36:34 -08:00
The Android Open Source Project
664ac3ceb1 am 3407c24d: am 6f3b20cc: Reconcile with jb-mr1-release - do not merge 
* commit '3407c24dd95896706a51d816b085e4ed8df3443a':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
  Notification vibration improvements: [DO NOT MERGE]
 2012-11-27 11:36:30 -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
Dianne Hackborn
78551bc7d5 am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit 'ba4ac51823c59152e2167365b81ac56857b6b4d0':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 11:31:53 -08:00
The Android Open Source Project
3407c24dd9 am 6f3b20cc: Reconcile with jb-mr1-release - do not merge 
* commit '6f3b20ccc14c25173780f01c621dbb2279cd8236':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
  Notification vibration improvements: [DO NOT MERGE]
 2012-11-27 11:31:40 -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
László Dávid
6ead9418ff Fix infinite recursive loop DO NOT MERGE 
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Note: Checked into AOSP. Cherry-picking for mr1.1.

Issue #7621806 IntProperty has infinite recursion bug

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
 2012-11-27 11:11:10 -08:00