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

96693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
ba4ac51823 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 2012-11-27 11:06:35 -08:00
Dianne Hackborn
8103890a59 Improve debugging for issue #7586414: AlarmManager wakelocks held 
In alarm manager, print a summary of the top 10 alarms by time
being executed.  Keep track of execution time (and wake count) of
each type of alarm for each application so this can be printed in
the summary (and used to compute the top 10 alarms).  Rework how
the alarm summary stats are tracked so that we don't need to hold
on to the full Intent for each stat and can get the Intent information
at the time the alarm is sent rather than waiting for whatever Intent
comes back in the result.

Also in the battery stats: sort the kernel wake locks by time, add
a new section showing all partial wake locks across all applications
sorted by time.

Finally a new LocalLog class that is used by AlarmManager to log
important warning messages, so these can also be later found in
its dumpsys output.

Change-Id: Icc07810053e60fb623a49937e696819cb8352b06
 2012-11-27 11:05:42 -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
The Android Open Source Project
6f3b20ccc1 Reconcile with jb-mr1-release - do not merge 
Change-Id: I60dc4bad2244ed88aec29926b08dcecf3a07462e
 2012-11-27 07:33:31 -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
Winson Chung
2b847c3933 Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 2012-11-26 16:20:23 -08:00
Michael Jurka
ab972a6dce Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev 2012-11-26 16:15:20 -08:00
Michael Jurka
e57922cc7d Fix bug: swiped apps in Recents come back on rotate 
Bug: 7409398
 2012-11-26 16:05:27 -08:00
Amith Yamasani
791f877473 Logging to help find the cause of widget crash in clock widget. 
This will continue to crash as before, but will show some useful
information in the exception.

Bug: 7450247

Change-Id: Ib3160a5f64154517791d165973c12294ecd09901
 2012-11-26 15:22:31 -08:00
Winson Chung
f7614fc744 Removing unecessary additional lock metadata from QuickSettings user tile. 
Change-Id: I89ec94385eb3cdd46ad6942bf8989fb04d5c0370
 2012-11-26 14:44:03 -08:00
Craig Mautner
164d4bb4c3 Extract AppTransition from WindowManager 
Refactor of WindowManagerService to move app transitions out.

Change-Id: Id3e377526a69f95a3ee4c0d97ca6fd84005beb6a
 2012-11-26 13:51:23 -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