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

114113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Colonna
85b11b6ec9 am 6d9b6bee: am 4811398b: Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev 
* commit '6d9b6beedcac132ae5f81ad561c2f11048a58da7':
  Fix 10550373: Stopping FUL when emergency dialer opens
 2013-09-17 15:03:31 -07:00
Brian Colonna
6d9b6beedc am 4811398b: Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev 
* commit '4811398bfdaf4cf07f945c46d15977fd7418f498':
  Fix 10550373: Stopping FUL when emergency dialer opens
 2013-09-17 15:01:06 -07:00
Brian Colonna
4811398bfd Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev 2013-09-17 21:58:05 +00:00
Brian Colonna
7fce380216 Fix 10550373: Stopping FUL when emergency dialer opens 
Face Unlock wasn't being stopped when the emergency dialer opened,
causing FUL to flash briefly after the emergency dialer appeared.
This was most noticeable on Hammerhead devices.

This change allows EmergencyButton to stop FUL by way of
KeyguardUpdateMonitor.  Note that it must stop FUL immediately rather
than going through a handler.  If going through a handler FUL is not
stopped in time to prevent the issue.

Change-Id: I3985969a19e909e2633d7876a3fb2d34c70e2cc1
 2013-09-17 17:33:21 -04:00
Alan Viverette
379c21518a Merge "Fix default style attr in DialogPreference subclass constructors" 2013-09-17 21:19:45 +00:00
Michael Jurka
1c7a180f3c am c23762ec: am 4c8cc720: Merge "Fix black bar drawn sometimes when swiping away items in Recents" into klp-dev 
* commit 'c23762ecd6efff066ed195f3db8dad27972035a1':
  Fix black bar drawn sometimes when swiping away items in Recents
 2013-09-17 14:02:43 -07:00
Michael Jurka
c23762ecd6 am 4c8cc720: Merge "Fix black bar drawn sometimes when swiping away items in Recents" into klp-dev 
* commit '4c8cc720e79f01840800bd0a6dd611d179acdbed':
  Fix black bar drawn sometimes when swiping away items in Recents
 2013-09-17 13:59:39 -07:00
Michael Jurka
4c8cc720e7 Merge "Fix black bar drawn sometimes when swiping away items in Recents" into klp-dev 2013-09-17 20:54:04 +00:00
Adam Powell
34155c49a5 am f35621da: am 70aafea9: Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev 
* commit 'f35621da26346e434d8144e5280707bddbdd5bff':
  Action bar transitions - handle expanding/collapsing action views
 2013-09-17 13:52:32 -07:00
Svetoslav
417787d374 am 70201a53: am 0cfebec5: Merge "Print pooler crashes for some page ranges." into klp-dev 
* commit '70201a53f4b38a655ce70b1530b0c40d76e8e37f':
  Print pooler crashes for some page ranges.
 2013-09-17 13:52:29 -07:00
Svetoslav Ganov
ad7220558c am 5d4f6871: am 22d2575c: Merge "Adding more standard media sizes." into klp-dev 
* commit '5d4f6871258260eded42adf55198fa499ebf7919':
  Adding more standard media sizes.
 2013-09-17 13:52:26 -07:00
Adam Powell
f35621da26 am 70aafea9: Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev 
* commit '70aafea91eedc70039818912007f43208e656240':
  Action bar transitions - handle expanding/collapsing action views
 2013-09-17 13:49:33 -07:00
Svetoslav
70201a53f4 am 0cfebec5: Merge "Print pooler crashes for some page ranges." into klp-dev 
* commit '0cfebec522539722f294a99bc32437b5d9e4b27d':
  Print pooler crashes for some page ranges.
 2013-09-17 13:49:31 -07:00
Svetoslav Ganov
5d4f687125 am 22d2575c: Merge "Adding more standard media sizes." into klp-dev 
* commit '22d2575c3eb5e2154bcb344372711bafc2e0b3d3':
  Adding more standard media sizes.
 2013-09-17 13:49:28 -07:00
Santos Cordon
8a4577a169 am deae1e11: am b00e5cc6: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'deae1e11bf9d6ee40e70bee62d24dbcb01ef1b60':
  Add permissions for the InCallUI Split.
 2013-09-17 13:48:46 -07:00
Adam Powell
70aafea91e Merge "Action bar transitions - handle expanding/collapsing action views" into klp-dev 2013-09-17 20:47:08 +00:00
Svetoslav
0cfebec522 Merge "Print pooler crashes for some page ranges." into klp-dev 2013-09-17 20:46:35 +00:00
Svetoslav Ganov
22d2575c3e Merge "Adding more standard media sizes." into klp-dev 2013-09-17 20:46:22 +00:00
Santos Cordon
deae1e11bf am b00e5cc6: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'b00e5cc610f24aca7e989db0ca552c952d2a924f':
  Add permissions for the InCallUI Split.
 2013-09-17 13:45:58 -07:00
Michael Jurka
69b8f11028 am b35d94e7: am d1544e3f: Merge "Reduce memory usage of default thumbnail" into klp-dev 
* commit 'b35d94e72156effc8d14125769fed32e4e5b7157':
  Reduce memory usage of default thumbnail
 2013-09-17 13:44:16 -07:00
Santos Cordon
b00e5cc610 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-17 20:43:04 +00:00
Michael Jurka
4a6bc55cd5 Fix black bar drawn sometimes when swiping away items in Recents 
- move drawing of faded black edges to RecentsPanelView
- invalidate RecentsPanelView when scroll value of Recents*ScrollView changes

Bug: 10022236

Change-Id: Idb102fb2454c2a077920b770e25c449ccd33486e
 2013-09-17 22:43:02 +02:00
Michael Jurka
b35d94e721 am d1544e3f: Merge "Reduce memory usage of default thumbnail" into klp-dev 
* commit 'd1544e3f71d35b01e34bbf64720f260c8fa2a7e8':
  Reduce memory usage of default thumbnail
 2013-09-17 13:42:29 -07:00
Michael Jurka
d1544e3f71 Merge "Reduce memory usage of default thumbnail" into klp-dev 2013-09-17 20:40:34 +00:00
Craig Mautner
8e60a4a765 am e3c9ae67: am 16efe96c: Merge "Fix parenthetical error." into klp-dev 
* commit 'e3c9ae67bb2ebf3f80c23674327cde6a873c671d':
  Fix parenthetical error.
 2013-09-17 13:28:20 -07:00
Craig Mautner
e3c9ae67bb am 16efe96c: Merge "Fix parenthetical error." into klp-dev 
* commit '16efe96cbc570ebd2fe7e823080ba4174fbb3cbe':
  Fix parenthetical error.
 2013-09-17 13:25:41 -07:00
Craig Mautner
16efe96cbc Merge "Fix parenthetical error." into klp-dev 2013-09-17 20:21:40 +00:00
Dianne Hackborn
19eacd566e am 0c95b8c8: am 463850e0: Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev 
* commit '0c95b8c824f8c2282eedde3af2f83af357b00975':
  Fix issue #10795385: System process crash reinstalling GEL -
 2013-09-17 11:12:30 -07:00
John Spurlock
4d5b6c7969 am b6ac744b: am 80645121: Merge "BatteryMeterView: Charging trumps empty." into klp-dev 
* commit 'b6ac744b11aaad592a8c27fdaafec5d5a6b90837':
  BatteryMeterView: Charging trumps empty.
 2013-09-17 11:12:27 -07:00
Dianne Hackborn
0c95b8c824 am 463850e0: Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev 
* commit '463850e0c658b37bbe29b9e9dec6ff7565bb883f':
  Fix issue #10795385: System process crash reinstalling GEL -
 2013-09-17 11:09:32 -07:00
John Spurlock
b6ac744b11 am 80645121: Merge "BatteryMeterView: Charging trumps empty." into klp-dev 
* commit '80645121fbba6f038feb48026d935b31028463d7':
  BatteryMeterView: Charging trumps empty.
 2013-09-17 11:09:29 -07:00
Dianne Hackborn
463850e0c6 Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev 2013-09-17 18:08:00 +00:00
John Spurlock
80645121fb Merge "BatteryMeterView: Charging trumps empty." into klp-dev 2013-09-17 18:07:25 +00:00
Dianne Hackborn
e56c2c3f05 Fix issue #10795385: System process crash reinstalling GEL - 
NPE at com.android.server.am.ProcessRecord.resetPackageList(ProcessRecord.java:596)

Take care of some more cases now that baseProcessTracker can be null.

Change-Id: I394c0b7802788118c3ad6bcac5dfdd23eeda8d58
 2013-09-17 11:03:10 -07:00
Craig Mautner
7504d7b24a Fix parenthetical error. 
Mis-grouping of && and || from CL ag/360551.

Fixes bug 10798273.

Change-Id: Idbc77e03d09f7ad5fcf1a5de98c6c14f0c63a6e4
 2013-09-17 10:50:53 -07:00
Craig Mautner
bf1217d751 am c37b3705: am fbd67258: Merge "More debugging for b/106899184" into klp-dev 
* commit 'c37b3705d82f214e53ba5ec9391dcf274a68ba32':
  More debugging for b/106899184
 2013-09-17 10:42:52 -07:00
Craig Mautner
c37b3705d8 am fbd67258: Merge "More debugging for b/106899184" into klp-dev 
* commit 'fbd67258e13d919f83f66f4e8a948f86aa507c26':
  More debugging for b/106899184
 2013-09-17 10:40:56 -07:00
Craig Mautner
fbd67258e1 Merge "More debugging for b/106899184" into klp-dev 2013-09-17 17:39:08 +00:00
Adam Powell
c46d33393f Action bar transitions - handle expanding/collapsing action views 
Make sure we beginDelayedTransition when we expand and collapse action
views, specifically before any callbacks go out that might alter the
hierarchy.

Change-Id: Iffc286cccd9be83ad03aeede605870ac12cc6bab
 2013-09-17 10:08:41 -07:00
Svetoslav Ganov
fa77ece25a Adding more standard media sizes. 
Added more North America media sizes as well as Chinese and Japanese.

bug:10495384

Change-Id: I74869c13d1412780b0053ef665845d65e972e526
 2013-09-17 09:54:58 -07:00
Craig Mautner
b1885b8588 More debugging for b/106899184 
Change-Id: I729a2c5bae087713765d782daaa7309ee6cd5b5a
 2013-09-17 09:35:20 -07:00
Dirk Dougherty
e45a28c0aa am a90a1bd8: am 6df7d4a5: am a621cfe8: am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit 'a90a1bd8c0c54be0cda4aad705f7d829e5c04947':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:30:16 -07:00
Dirk Dougherty
a90a1bd8c0 am 6df7d4a5: am a621cfe8: am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit '6df7d4a574ffd85c82cad402552e3854df3a3f85':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:27:51 -07:00
Dirk Dougherty
6df7d4a574 am a621cfe8: am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit 'a621cfe84fcdab3b4e956148203be66e158316da':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:25:31 -07:00
Michael Jurka
9926272f32 Reduce memory usage of default thumbnail 
Bug: 10639174

Change-Id: I2b7f3844e77427d2327a7d89c63e4f3b0d890bc0
 2013-09-17 18:24:47 +02:00
Dirk Dougherty
a621cfe84f am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit 'fe790af5897a9c466b5b0a79201ad7752782eaac':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:23:21 -07:00
Dirk Dougherty
fe790af589 am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 
* commit '1e6c936e84675925ef5c58a04c6e80d8894d7128':
  Doc change: change initial quota limit for Google Play Developer API v1_1.
 2013-09-17 09:20:57 -07:00
Dirk Dougherty
1e6c936e84 Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs 2013-09-17 16:17:58 +00:00
Dirk Dougherty
1ef5374793 Doc change: change initial quota limit for Google Play Developer API v1_1. 
Change-Id: I553bbe9794cfbeee0fc8ebeded5af9ce6256a975
 2013-09-17 09:13:29 -07:00
Jean-Michel Trivi
cb49d18c27 am eded3b50: am 2a07bde6: Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 
* commit 'eded3b50d7f5a334e138338fbeac508fb0c7b679':
  Public API for LoudnessEnhancer audio effect
 2013-09-17 09:05:43 -07:00