Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
159,201 Commits 3 Branches 0 Tags
f1c91fec09c3ed9ec0dcafe10ed2942d91d2a975
Commit Graph

159201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
f1c91fec09 am 30dca470: am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit '30dca470d6b261433f0ad11117e5dff7d9124d9e':
  Account for alpha in hasShadow()
 2014-09-20 00:19:38 +00:00
Dianne Hackborn
44c49d9291 am 77817a6b: am 4b091802: am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 
* commit '77817a6b4e3bf133505e079de654afff0ba25b0d':
  Fix issue #17574819: Chrome browser process is killed in background...
 2014-09-20 00:19:34 +00:00
Dianne Hackborn
5dc8f3ff16 am 9f547d09: am c8baca41: am ae1e4824: am cfcaa31f: Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev 
* commit '9f547d09c19dc8aea3f7cffd84ade9ecc7ed17a6':
  Work on issue #17381033: Program icon and shortcut disappear after...
 2014-09-20 00:19:29 +00:00
Chris Craik
cac59c8de4 am f0a80b68: am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit 'f0a80b68f729914c83ee897d8bf8060b031333bc':
  Account for alpha in hasShadow()
 2014-09-20 00:08:12 +00:00
Dianne Hackborn
a0e661ee3d am 4b091802: am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 
* commit '4b0918021665f499c7fa57b8d6d5cb3ceca9c77e':
  Fix issue #17574819: Chrome browser process is killed in background...
 2014-09-20 00:08:08 +00:00
Dianne Hackborn
fc1ed4adaa am c8baca41: am ae1e4824: am cfcaa31f: Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev 
* commit 'c8baca41100b17e321d8df4c72e741d30563788b':
  Work on issue #17381033: Program icon and shortcut disappear after...
 2014-09-20 00:08:04 +00:00
Amit Mahajan
6aed028e8a am 1ab5ba1b: am 9abf8a29: am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '1ab5ba1b7d1ef926d72013cb2b7795284d70f101':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-20 00:06:49 +00:00
Chris Craik
031bc65836 am ea74883e: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit 'ea74883e54be60bad3fb6021c5842b238d535d27':
  Account for alpha in hasShadow()
 2014-09-19 23:56:43 +00:00
Dianne Hackborn
1335769823 am 3ed0079f: am 8a9df5a2: Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 
* commit '3ed0079f283999fe25e5afff73710fec2c2c8162':
  Fix issue #17574819: Chrome browser process is killed in background...
 2014-09-19 23:56:40 +00:00
Dianne Hackborn
f2c638ecb3 am ae1e4824: am cfcaa31f: Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev 
* commit 'ae1e4824bd049ffc6e677ab1c6de16fe35cf266c':
  Work on issue #17381033: Program icon and shortcut disappear after...
 2014-09-19 23:56:36 +00:00
Christopher Tate
37a52a103a am 27935970: am 4f3cb005: am 9c236001: am a739f0df: Logspam is spam 
* commit '2793597078ee6cbb04eafea48ba0ee89f0b73449':
  Logspam is spam
 2014-09-19 23:56:20 +00:00
Amit Mahajan
2bf16788c9 am 9abf8a29: am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '9abf8a29afacd6ad2b87f5563152e1ebb0dadf13':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-19 23:55:39 +00:00
Chris Craik
3d4df3b67b am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev 
* commit 'fe01ab10593f07ec17bdf490fcd8b57296616fa4':
  Account for alpha in hasShadow()
 2014-09-19 23:44:04 +00:00
Dianne Hackborn
fb08ea8b03 am 8a9df5a2: Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 
* commit '8a9df5a21c166218ace936e1443948500ed0792f':
  Fix issue #17574819: Chrome browser process is killed in background...
 2014-09-19 23:38:34 +00:00
Dianne Hackborn
d61d0ade23 am cfcaa31f: Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev 
* commit 'cfcaa31f5136b44da4b8b9ae16ec3311d9c7cdde':
  Work on issue #17381033: Program icon and shortcut disappear after...
 2014-09-19 23:38:29 +00:00
Amit Mahajan
af1fc47cd4 am 57f63262: am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '57f632624cb36e86fa92ab072ee56796862237ed':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-19 23:36:53 +00:00
Christopher Tate
258a120a22 am 4f3cb005: am 9c236001: am a739f0df: Logspam is spam 
* commit '4f3cb0054c5ba1283335cb1901c0d74b085d4f33':
  Logspam is spam
 2014-09-19 23:36:35 +00:00
Chris Craik
9e7c919191 Merge "Account for alpha in hasShadow()" into lmp-dev 2014-09-19 23:36:22 +00:00
Amit Mahajan
94c554ccdf am 04ac796c: Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 
* commit '04ac796c6191dbeb7d393664ef1ca27624f934b8':
  Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
 2014-09-19 23:27:03 +00:00
Dianne Hackborn
cf456e3c22 Merge "Fix issue #17574819: Chrome browser process is killed in background..." into lmp-dev 2014-09-19 23:26:18 +00:00
Dianne Hackborn
cfb67ee40c Merge "Work on issue #17381033: Program icon and shortcut disappear after..." into lmp-dev 2014-09-19 23:24:19 +00:00
Dianne Hackborn
0ed82e2c21 Work on issue #17381033: Program icon and shortcut disappear after... 
...running monkey test overnight [FACTORY ROM BLOCKER]

Add surface tracing to debug output.

Change-Id: I65f7fc90c51b0805f7e0090141c33d6b60ccb3b4
 2014-09-19 16:22:50 -07:00
Alan Viverette
4828d7afed am a59a64e7: am c53cce28: am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'a59a64e7b890e0683592479ec4d985f383792c54':
  Update theme colors for better contrast and de-blueing
 2014-09-19 23:18:55 +00:00
Elliott Hughes
69eb21074f am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '4fec1b488759a89732af151e21a89aa6693ba9bf':
  Use constants instead of resources for ellipsis.
 2014-09-19 23:16:52 +00:00
Christopher Tate
9564b1d2f7 am 9c236001: am a739f0df: Logspam is spam 
* commit '9c23600139f0b410cd85d6495da2fe92c4def17f':
  Logspam is spam
 2014-09-19 23:16:32 +00:00
Dan Albert
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
 2014-09-19 16:13:49 -07:00
Amit Mahajan
c2492e19ea Merge "Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable" into lmp-dev 2014-09-19 23:12:58 +00:00
Hui Wang
4b57b991ac Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable 
Bug: 17567651, 16308209
Change-Id: Ie164b16b70429d5815e9bef5f8c5489f6e49de36
 2014-09-19 23:11:58 +00:00
Christopher Tate
b9da579818 am a739f0df: Logspam is spam 
* commit 'a739f0df4e63856b30a653f61a0a296fc6148688':
  Logspam is spam
 2014-09-19 23:06:00 +00:00
Chris Craik
9fa364dc72 Account for alpha in hasShadow() 
bug:17587220
Change-Id: Ic7f2dea95302b713dc93edb4a0193a7be77fb2eb
 2014-09-19 16:04:45 -07:00
Alan Viverette
0e3b5a7986 am 4ecec44c: am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '4ecec44cf37c7df41295eb5897d04c32f7806b73':
  Correctly apply max width/height to preference icons
 2014-09-19 23:03:56 +00:00
Alan Viverette
cc3d6afbf9 am c53cce28: am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'c53cce28e59fe38525770e06f42244a4bd33a2a0':
  Update theme colors for better contrast and de-blueing
 2014-09-19 23:03:35 +00:00
Alan Viverette
fd6f5bb3a0 am b55ced84: am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit 'b55ced8402d28591d324317f1ddcb2db95ea7cb8':
  Correctly apply max width/height to preference icons
 2014-09-19 22:53:24 +00:00
Alan Viverette
3a0caadbf9 am 38321d61: am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit '38321d617c25ccc7fe5e9da611d2bc7259016d8c':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:51:28 +00:00
Dan Albert
5648b12da1 resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp 
Change-Id: Ifedb15de5a4db6cb0238fec93aaa2d95f1844694
 2014-09-19 15:50:13 -07:00
Christopher Tate
eae9216770 Logspam is spam 
This turns out to happen a lot in normal usage, but we're logging
copiously about it each time.  It's reporting "oh hey we're already
in this state" -- and so the log is not useful anyway.

Logspam is spam.

Bug 15169507

Change-Id: Ie2d01ff1b0b3600dd9c15ccf83d60875558f1dc2
 2014-09-19 22:49:20 +00:00
Alan Viverette
4d5e9fc39d am 13527b41: am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '13527b41ba5613cf2861782aafa3b2fd3299bcf2':
  Correctly apply max width/height to preference icons
 2014-09-19 22:38:34 +00:00
Alan Viverette
9ad4d87a53 am d112a2d9: Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 
* commit 'd112a2d9afb11c46d9c806d70c794cfaf972e510':
  Update theme colors for better contrast and de-blueing
 2014-09-19 22:38:26 +00:00
Alan Viverette
edcb2d0e89 Merge "Update theme colors for better contrast and de-blueing" into lmp-dev 2014-09-19 22:28:08 +00:00
Ian Rogers
e9b6cb8058 am ad64befd: am 296a712e: Merge "Make a field final." 
* commit 'ad64befd25befae3d71c53be6d6a31d1f8d12464':
  Make a field final.
 2014-09-19 22:27:36 +00:00
Alan Viverette
2300412761 am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev 
* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
  Correctly apply max width/height to preference icons
 2014-09-19 22:27:16 +00:00
Svetoslav
86d07089e6 am b38e8d02: am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit 'b38e8d02bc75eb13f9cb78bea6ae6102f594b587':
  Keep existing API behavior that regressed.
 2014-09-19 22:26:25 +00:00
Dianne Hackborn
5f950269ce am 7e3752e6: am 24a306c5: am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit '7e3752e6f54955de8084dc9f320483f79fbc88a4':
  Add new activity dumpsys command to persist all data.
 2014-09-19 22:26:20 +00:00
Svetoslav
52dc625669 am e5350332: am 63f3936c: am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit 'e535033270273ce07384647c99828ab11a5564d0':
  Fix a print spooler crash when printing.
 2014-09-19 22:26:14 +00:00
Alan Viverette
daf8588275 Merge "Correctly apply max width/height to preference icons" into lmp-dev 2014-09-19 22:19:02 +00:00
Alan Viverette
0fa3c1c656 Update theme colors for better contrast and de-blueing 
BUG: 17520824
Change-Id: Id9f90136cea169ba9e58db957034c539ef25121f
 2014-09-19 22:17:45 +00:00
Svetoslav
9430598f91 am f2345ebc: am 61052dec: am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev 
* commit 'f2345ebce31740d9fca90c46a9ffb103d723a31f':
  Keep existing API behavior that regressed.
 2014-09-19 22:14:55 +00:00
Dianne Hackborn
1aab9db175 am 24a306c5: am 3052e6ed: am cb2775a7: Merge "Add new activity dumpsys command to persist all data." into lmp-dev 
* commit '24a306c5f9431535fd019a7a59d2dc6a76050501':
  Add new activity dumpsys command to persist all data.
 2014-09-19 22:14:51 +00:00
Elliott Hughes
4fec1b4887 am 600ca140: Merge "Use constants instead of resources for ellipsis." 
* commit '600ca140e2e31e76f9bef7d484387ea366812cb3':
  Use constants instead of resources for ellipsis.
 2014-09-19 22:14:48 +00:00
Svetoslav
06be8ab63c am 63f3936c: am 0d397697: am a2201272: Merge "Fix a print spooler crash when printing." into lmp-dev 
* commit '63f3936c8d6e4dee8027b09d031d6f77482e6610':
  Fix a print spooler crash when printing.
 2014-09-19 22:14:47 +00:00