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

117246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
09854a9b3e am c7db2855: am 64ee79dd: am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev 
* commit 'c7db28558d737d2d06fc2f0545f19350dc603666':
  The callbacks for tracking a printer called more than once without printer change.
 2013-10-14 10:51:29 -07:00
Adam Powell
0f58327f6a am b0d1ee90: am e9ced533: am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons 
* commit 'b0d1ee9033e72a457f19563c966cd28ed647aa83':
  Use INVISIBLE instead of GONE to hide KG transport buttons
 2013-10-14 10:51:23 -07:00
Eino-Ville Talvala
0c90ead261 am 12e9f699: (-s ours) am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev 
* commit '12e9f699130458e39d15becf05f993c7429a38fa':
  DO NOT MERGE: Hide new camera API.
 2013-10-14 10:51:04 -07:00
Craig Mautner
2d9b69b7a3 am 55eef710: am cd32edfb: am 5b64aa68: Merge "Restore wallpaper positioning between apps." into klp-dev 
* commit '55eef7108c1ed76521f6af57d0334bf22f7899b4':
  Restore wallpaper positioning between apps.
 2013-10-14 10:50:59 -07:00
Craig Mautner
5d140e0e56 am 3e9230d4: am 22e4a1b8: am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev 
* commit '3e9230d42fb29a160af0eb1bc6ebb4a2f116e808':
  Only return to home if the foreground task is removed.
 2013-10-14 10:50:53 -07:00
Svetoslav Ganov
e50c500924 am ff98feec: am 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev 
* commit 'ff98feec6f37485b7f5e025d221fe5c9ae147b03':
  Printed document size not persisted.
 2013-10-14 10:50:50 -07:00
Svetoslav Ganov
132a9e2a6e am 603ece2e: am bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 
* commit '603ece2e8e3f5a73007fd42d3be52123a351eef0':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
 2013-10-14 10:50:42 -07:00
Joe Malin
de122ce5a4 am 5f2bc80f: am e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class 
* commit '5f2bc80f18833ce630b6fe86fd8286aa14eb36ca':
  DOC CHANGE: FileProvider training class
 2013-10-14 10:50:38 -07:00
Craig Mautner
6817136509 am 76371f0f: am 2c1934d3: am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev 
* commit '76371f0f0e7db8b3eaad5db42d9eb41361382087':
  Test for hidden keyguard before waiting for it.
 2013-10-14 10:50:06 -07:00
Jim Miller
a200cad2d3 am c2bf92d4: am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev 
* commit 'c2bf92d42a032c9dadd25904a5b0f183585dc024':
  Fix problem where PhoneWindowManager waits for keyguard to draw
 2013-10-14 10:50:02 -07:00
Craig Mautner
8a3146e960 am 272b0929: am 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev 
* commit '272b0929a9022f4f1cfc6b72fdbb9cb2416e5bd2':
  When removing a task that was on home, put home on top.
 2013-10-14 10:49:55 -07:00
Jim Miller
a9c6cb6013 am c69fa275: am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev 
* commit 'c69fa2751350355370a85ab0b92655b73047b91e':
  Enable time format localization in keyguard
 2013-10-14 10:49:40 -07:00
Robert Greenwalt
ed22e9ce2f am dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev 
* commit 'dcc31551f80500a096b8eb95f7f0670b4c19fd95':
  Make Wifi Scans more heap-efficient
 2013-10-14 10:49:34 -07:00
Baligh Uddin
ac46ea109e am 92756b89: (-s ours) am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '92756b89c8be90ceb9804f3e77731e233c522a2c':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:30 -07:00
Baligh Uddin
2d42b826d2 am 93a1154f: (-s ours) am a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '93a1154fbf3b2eb30bc721df3b16f6c52151475e':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:24 -07:00
Baligh Uddin
e394609a1a am 480f83cf: (-s ours) am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '480f83cfc661e437c77e6faa67a754ae22cee1d6':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:20 -07:00
Baligh Uddin
fd79664ca9 am e6cc525f: (-s ours) am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'e6cc525f45e6856a1344a5a21ca119748f7bf84f':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:18 -07:00
Baligh Uddin
ad5e2b85cf am e3e194ae: (-s ours) am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'e3e194ae8bd3ad269f0524f24f4b913b0dd6eb6b':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:14 -07:00
Baligh Uddin
a80aa9e07a am 9f93c67c: (-s ours) am adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '9f93c67c6ae56894b0ca8ccc6b55c6ff239ff3f3':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:11 -07:00
Baligh Uddin
fe5f12b8e9 am b780082c: (-s ours) am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b780082cf3372f0e44ffbd7ce2a5b17ebf05a39b':
  Import translations. DO NOT MERGE
 2013-10-14 10:49:08 -07:00
Svetoslav
58a22cdf29 am 455e95eb: am 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev 
* commit '455e95ebab93c1d5c692114186807a058b454d73':
  Putting the cursor at the end of the copies and range inputs.
 2013-10-14 10:49:05 -07:00
Chris Craik
37c4687190 am e0db6fc6: am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev 
* commit 'e0db6fc6847f0404b704c179d4795b27d9025693':
  Document special case in hasOverlappingRendering
 2013-10-14 10:48:57 -07:00
Jim Miller
a2319d1210 am 4f2bcde9: am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev 
* commit '4f2bcde9db26523fd7c048be1b502f12328ee60c':
  Delay all widget additions in keyguard until after boot completes
 2013-10-14 10:48:30 -07:00
Jeff Sharkey
ad9739cdbe am 5f7f97e0: am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev 
* commit '5f7f97e01507c6d5860388dfea860e05c2a3616e':
  Fix spelling.
 2013-10-14 10:48:23 -07:00
Svetoslav
0983f49eff am 00040103: am 8e80d1f9: am 33021d95: Merge "Adding timeout if the current printer or its capabilities disappear." into klp-dev 
* commit '0004010369ef713ae9bdbdeb8e16bfbdcd835811':
  Adding timeout if the current printer or its capabilities disappear.
 2013-10-14 10:48:19 -07:00
Matthew Williams
d08d6686c5 resolved conflicts for merge of 94b51810 to master 
Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49
 2013-10-14 10:39:41 -07:00
Baligh Uddin
8f7b859a7d Merge "Import translations. DO NOT MERGE" 2013-10-14 16:22:55 +00:00
Baligh Uddin
7d8b77f036 Import translations. DO NOT MERGE 
Change-Id: Ib9ba58f8e1486581d71443234db99a12f925cf0a
Auto-generated-cl: translation import
 2013-10-14 09:17:56 -07:00
Baligh Uddin
7967b0c141 Merge "Import translations. DO NOT MERGE" 2013-10-14 16:15:14 +00:00
Baligh Uddin
11bb67d6c2 Import translations. DO NOT MERGE 
Change-Id: Ib34e81399bfc7c5867fcc060af7d5487485a2855
Auto-generated-cl: translation import
 2013-10-14 09:13:55 -07:00
Baligh Uddin
0da3dea90c Import translations. DO NOT MERGE 
Change-Id: I734c073236b4d50576d962b23f4b50abfccec16e
Auto-generated-cl: translation import
 2013-10-14 09:12:27 -07:00
Narayan Kamath
12b28ce4e8 Fix minor thread corectness issue in NetworkInfo 
Hold the right lock while copying info from another
NetworkInfo object to prevent changes being made to it
while the copy is in progress.

Change-Id: I1aa2c29e81e045b0359f957352c438e79e692823
 2013-10-14 09:07:40 +00:00
Svetoslav Ganov
c7db28558d am 64ee79dd: am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev 
* commit '64ee79dd2d0b7a5bdff2590f252661d2fa5f76d7':
  The callbacks for tracking a printer called more than once without printer change.
 2013-10-13 12:15:13 -07:00
Svetoslav Ganov
64ee79dd2d am 3cccec4c: Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev 
* commit '3cccec4c6eb9f8494b777cbb1b0e45db80974ac8':
  The callbacks for tracking a printer called more than once without printer change.
 2013-10-13 12:11:52 -07:00
Svetoslav Ganov
3cccec4c6e Merge "The callbacks for tracking a printer called more than once without printer change." into klp-dev 2013-10-13 19:07:26 +00:00
Adam Powell
b0d1ee9033 am e9ced533: am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons 
* commit 'e9ced533fab98f8b0272768d3b916be01c73f1c4':
  Use INVISIBLE instead of GONE to hide KG transport buttons
 2013-10-13 11:14:37 -07:00
Adam Powell
e9ced533fa am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons 
* commit 'f51769221c6defd75cd412964715c0a181e31722':
  Use INVISIBLE instead of GONE to hide KG transport buttons
 2013-10-13 11:12:03 -07:00
Adam Powell
f51769221c Use INVISIBLE instead of GONE to hide KG transport buttons 
Maintain a stable/predictable button layout when a remote control
client shows or hides specific transport control buttons.

Bug 11195246

Change-Id: I0e745150127c5e354ed2752c379e05ea8e0bd33d
 2013-10-13 10:39:04 -07:00
Eino-Ville Talvala
12e9f69913 am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev 
* commit '914970b4735993df3246b02fd9a18b55f15ea8d4':
  DO NOT MERGE: Hide new camera API.
 2013-10-12 18:56:23 -07:00
Eino-Ville Talvala
914970b473 am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev 
* commit 'd38b1302b7506ae7eef6c6680228c0f07f6e1895':
  DO NOT MERGE: Hide new camera API.
 2013-10-12 18:53:54 -07:00
Eino-Ville Talvala
d38b1302b7 Merge "DO NOT MERGE: Hide new camera API." into klp-dev 2013-10-13 01:50:30 +00:00
Craig Mautner
55eef7108c am cd32edfb: am 5b64aa68: Merge "Restore wallpaper positioning between apps." into klp-dev 
* commit 'cd32edfb0ff101b68fe4ea1eb3e4fe0b41a17711':
  Restore wallpaper positioning between apps.
 2013-10-12 18:46:09 -07:00
Craig Mautner
3e9230d42f am 22e4a1b8: am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev 
* commit '22e4a1b8e5ca72988bbdd7da2b7fe38f53d85c26':
  Only return to home if the foreground task is removed.
 2013-10-12 18:46:05 -07:00
Craig Mautner
cd32edfb0f am 5b64aa68: Merge "Restore wallpaper positioning between apps." into klp-dev 
* commit '5b64aa689f22fd72107db26a7ba42654599144e4':
  Restore wallpaper positioning between apps.
 2013-10-12 18:43:19 -07:00
Craig Mautner
22e4a1b8e5 am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev 
* commit '10ea197826a2878f17a53dfc9ff4da4ee674244c':
  Only return to home if the foreground task is removed.
 2013-10-12 18:43:15 -07:00
Craig Mautner
5b64aa689f Merge "Restore wallpaper positioning between apps." into klp-dev 2013-10-13 01:40:44 +00:00
Craig Mautner
10ea197826 Merge "Only return to home if the foreground task is removed." into klp-dev 2013-10-13 01:40:02 +00:00
Svetoslav Ganov
ff98feec6f am 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev 
* commit '79ddf835227283979dc353e57711a9d6dff8edb0':
  Printed document size not persisted.
 2013-10-12 17:37:38 -07:00
Svetoslav Ganov
603ece2e8e am bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev 
* commit 'bfc8edcf55c4f65ec00ca5d921a3cae1b367b248':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
 2013-10-12 17:37:35 -07:00
Svetoslav Ganov
79ddf83522 am bececbfa: Merge "Printed document size not persisted." into klp-dev 
* commit 'bececbfae675055aa60ea21c5b8bd3dbb8acdbac':
  Printed document size not persisted.
 2013-10-12 17:34:47 -07:00