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

117200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim Miller
c2bf92d42a am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev 
* commit '09abd164e722dfc03dad48106a557217563d3b21':
  Fix problem where PhoneWindowManager waits for keyguard to draw
 2013-10-11 21:35:24 -07:00
Jim Miller
09abd164e7 am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev 
* commit '2222a508e7a1ae963ac1891c555f9add10e571af':
  Fix problem where PhoneWindowManager waits for keyguard to draw
 2013-10-11 21:32:35 -07:00
Jim Miller
2222a508e7 Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev 2013-10-12 04:29:01 +00:00
Jim Miller
6a3cceb4d9 Fix problem where PhoneWindowManager waits for keyguard to draw 
This fixes a problem where PhoneWindowManager times out waiting
for keyguard to draw when it's disabled.  Instead, we pass a null
token back which allows PhoneWindowManager to continue.

Fixes bug 11190932

Change-Id: I041ea1d88dca681476d9477a3aab54559976b312
 2013-10-11 21:23:32 -07:00
Craig Mautner
272b0929a9 am 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev 
* commit '6b5fc882d1823c8922860ef284442442b635111b':
  When removing a task that was on home, put home on top.
 2013-10-11 19:48:12 -07:00
Craig Mautner
6b5fc882d1 am 166434ec: Merge "When removing a task that was on home, put home on top." into klp-dev 
* commit '166434eca57a09aed9347a3cfff5e80b268f97b0':
  When removing a task that was on home, put home on top.
 2013-10-11 19:44:31 -07:00
Craig Mautner
166434eca5 Merge "When removing a task that was on home, put home on top." into klp-dev 2013-10-12 02:42:38 +00:00
Jim Miller
c69fa27513 am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev 
* commit '8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9':
  Enable time format localization in keyguard
 2013-10-11 18:11:05 -07:00
Jim Miller
8eebe3b5bc am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev 
* commit 'dc70340d48eeddf4aa92a4d199179cde269c5bd4':
  Enable time format localization in keyguard
 2013-10-11 18:08:00 -07:00
Jim Miller
dc70340d48 Merge "Enable time format localization in keyguard" into klp-dev 2013-10-12 01:00:24 +00:00
Jim Miller
0c48689b08 Enable time format localization in keyguard 
Fixes bug 11173871

Change-Id: Ife44c93b01770a3349343d034fe6adb1c6d66185
 2013-10-11 17:50:35 -07:00
Robert Greenwalt
dcc31551f8 am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev 
* commit 'e9d997050bdd4cc273205f3451995f0e1e9cc3af':
  Make Wifi Scans more heap-efficient
 2013-10-11 17:37:56 -07:00
Craig Mautner
8e5695778f When removing a task that was on home, put home on top. 
Killing an app that was launched from home was not relaunching home.
Previous situations relaunched the next app (i.e. home) based on the
task flag. However, when an app dies the relaunch is deferred until
the TaskRecord has long been forgotten. This fix rearranges the stacks
immediately upon the TaskRecord being removed from the stack. Then the
next resumeTopActivities() call will start the home task.

Fixes bug 11189555.

Change-Id: I0e09350a7db55ea8b38cce7bf4b69923a6b99494
 2013-10-11 17:36:59 -07:00
Baligh Uddin
92756b89c8 am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5a531ff96081c20cab087306907c406076a10ddb':
  Import translations. DO NOT MERGE
 2013-10-11 17:34:14 -07:00
Baligh Uddin
93a1154fbf am a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a57076e820731347236e69aee8abab73f2ab2ad2':
  Import translations. DO NOT MERGE
 2013-10-11 17:34:11 -07:00
Baligh Uddin
480f83cfc6 am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'db79e4d41d21cf7daf403d680851d78c6c59a2af':
  Import translations. DO NOT MERGE
 2013-10-11 17:34:07 -07:00
Robert Greenwalt
e9d997050b am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev 
* commit '72dc0b439152ad1428d8713abc2b8f16911e2e7e':
  Make Wifi Scans more heap-efficient
 2013-10-11 17:33:21 -07:00
Baligh Uddin
e6cc525f45 am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'b43e0eadbe144eae189ecf9f26005fd76d9f31d6':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:31 -07:00
Baligh Uddin
e3e194ae8b am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '8cdfa5cd18ecf552f99c826797951a9a86c2af3c':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:28 -07:00
Baligh Uddin
9f93c67c6a am adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit 'adb1b5b43f517751151835e2143d53ad3666ac8e':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:25 -07:00
Baligh Uddin
b780082cf3 am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev 
* commit '4bb81ac838dd910ea4a8dded676d70d4e399eed9':
  Import translations. DO NOT MERGE
 2013-10-11 17:30:23 -07:00
Robert Greenwalt
72dc0b4391 Merge "Make Wifi Scans more heap-efficient" into klp-dev 2013-10-12 00:30:22 +00:00
Baligh Uddin
5a531ff960 am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ea9aec27cc792027c94fe2d1d60586efb4f85d24':
  Import translations. DO NOT MERGE
 2013-10-11 17:29:40 -07:00
Baligh Uddin
a57076e820 am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '3c10347cdb84db55320d964778ff684f059cecad':
  Import translations. DO NOT MERGE
 2013-10-11 17:29:36 -07:00
Baligh Uddin
db79e4d41d am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '84f5bf823972b87be1ee0334f96a2ed3216e81a7':
  Import translations. DO NOT MERGE
 2013-10-11 17:29:33 -07:00
Baligh Uddin
b43e0eadbe Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-12 00:27:48 +00:00
Baligh Uddin
849a41a865 Merge "Import translations. DO NOT MERGE" 2013-10-12 00:27:35 +00:00