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

114087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jean-Michel Trivi
eded3b50d7 am 2a07bde6: Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 
* commit '2a07bde60732ac74920b5083295e9f7694d2bfcd':
  Public API for LoudnessEnhancer audio effect
 2013-09-17 09:02:29 -07:00
Amith Yamasani
000ecdd3f5 am 6484c42e: am 33caca5c: Merge "Add a feature to specify if device admins are supported on the device" into klp-dev 
* commit '6484c42eb44bfe8fc8d2972bfc564b96f0f7f16c':
  Add a feature to specify if device admins are supported on the device
 2013-09-17 09:02:07 -07:00
Jean-Michel Trivi
2a07bde607 Merge "Public API for LoudnessEnhancer audio effect" into klp-dev 2013-09-17 16:00:07 +00:00
Amith Yamasani
6484c42eb4 am 33caca5c: Merge "Add a feature to specify if device admins are supported on the device" into klp-dev 
* commit '33caca5cd56ff41142cea121fabf5e30bebfb39f':
  Add a feature to specify if device admins are supported on the device
 2013-09-17 08:58:57 -07:00
Amith Yamasani
33caca5cd5 Merge "Add a feature to specify if device admins are supported on the device" into klp-dev 2013-09-17 15:56:14 +00:00
John Spurlock
d19877f8a3 BatteryMeterView: Charging trumps empty. 
Match the style implicit in the battery assets: if charging,
show the bolt, not the exclamation point.

Bug:10651062
Change-Id: I3edd822326ad611972e791cf4acc8c395e51a74d
 2013-09-17 11:03:03 -04:00
Baligh Uddin
2c0d90a67e am be2683fa: (-s ours) am fd111c8f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'be2683fab5d5abe4768387c3bc39334988b0d232':
  Import translations. DO NOT MERGE
 2013-09-16 21:11:45 -07:00
Baligh Uddin
ec5045f20f am ddaaed40: (-s ours) am 5dd80754: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ddaaed406aa7e4147006d9e22f6e0ca8c4c568e4':
  Import translations. DO NOT MERGE
 2013-09-16 21:11:42 -07:00
Baligh Uddin
f07aba0b83 am de865169: (-s ours) am eedb4f8f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'de865169fd449cdd190f1631c06708e3fde6e651':
  Import translations. DO NOT MERGE
 2013-09-16 21:11:37 -07:00
Baligh Uddin
8995b3c723 am 72a6213e: (-s ours) am 5a9948e1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '72a6213e4696be353b9e1d5672fad13fb5d7ce1c':
  Import translations. DO NOT MERGE
 2013-09-16 21:11:34 -07:00
Baligh Uddin
be2683fab5 am fd111c8f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fd111c8f61b006e66a6670cbf4e1c579000ba3e3':
  Import translations. DO NOT MERGE
 2013-09-16 21:09:07 -07:00
Baligh Uddin
ddaaed406a am 5dd80754: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5dd80754a396c46b85ceaf7bd117c704413d2894':
  Import translations. DO NOT MERGE
 2013-09-16 21:09:04 -07:00
Baligh Uddin
de865169fd am eedb4f8f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'eedb4f8f857e83ab67d22d36da77dc9b3c8a5bcc':
  Import translations. DO NOT MERGE
 2013-09-16 21:09:01 -07:00
Baligh Uddin
72a6213e46 am 5a9948e1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5a9948e1b9a3fad6b95d7cddae2306c0200f28d3':
  Import translations. DO NOT MERGE
 2013-09-16 21:08:59 -07:00
Baligh Uddin
b1c85e4a8e Merge "Import translations. DO NOT MERGE" 2013-09-17 04:05:28 +00:00
Baligh Uddin
fd111c8f61 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:05:19 +00:00
Baligh Uddin
e7e3394d4a Merge "Import translations. DO NOT MERGE" 2013-09-17 04:05:10 +00:00
Baligh Uddin
5dd80754a3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:05:05 +00:00
Baligh Uddin
67d24eb342 Merge "Import translations. DO NOT MERGE" 2013-09-17 04:04:55 +00:00
Baligh Uddin
eedb4f8f85 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:04:51 +00:00
Baligh Uddin
da90357cf8 Merge "Import translations. DO NOT MERGE" 2013-09-17 04:04:36 +00:00
Baligh Uddin
5a9948e1b9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-17 04:04:23 +00:00
Svetoslav
06c7f39f6f am e7d34086: am be0d9317: Merge "App UI freezes when printing. API clean up." into klp-dev 
* commit 'e7d3408652dd6e997a3c5abfd5abc6855aa170c0':
  App UI freezes when printing. API clean up.
 2013-09-16 19:32:41 -07:00