OSDN Git Service

android-x86/frameworks-base.git
10 years agoam ff98feec: am 79ddf835: am bececbfa: Merge "Printed document size not persisted...
Svetoslav Ganov [Mon, 14 Oct 2013 17:50:50 +0000 (10:50 -0700)]
am ff98feec: am 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev

* commit 'ff98feec6f37485b7f5e025d221fe5c9ae147b03':
  Printed document size not persisted.

10 years agoam 603ece2e: am bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e...
Svetoslav Ganov [Mon, 14 Oct 2013 17:50:42 +0000 (10:50 -0700)]
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.

10 years agoam 5f2bc80f: am e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC...
Joe Malin [Mon, 14 Oct 2013 17:50:38 +0000 (10:50 -0700)]
am 5f2bc80f: am e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class

* commit '5f2bc80f18833ce630b6fe86fd8286aa14eb36ca':
  DOC CHANGE: FileProvider training class

10 years agoam 76371f0f: am 2c1934d3: am 5a783173: Merge "Test for hidden keyguard before waiting...
Craig Mautner [Mon, 14 Oct 2013 17:50:06 +0000 (10:50 -0700)]
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.

10 years agoam c2bf92d4: am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager...
Jim Miller [Mon, 14 Oct 2013 17:50:02 +0000 (10:50 -0700)]
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

10 years agoam 272b0929: am 6b5fc882: am 166434ec: Merge "When removing a task that was on home...
Craig Mautner [Mon, 14 Oct 2013 17:49:55 +0000 (10:49 -0700)]
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.

10 years agoam c69fa275: am 8eebe3b5: am dc70340d: Merge "Enable time format localization in...
Jim Miller [Mon, 14 Oct 2013 17:49:40 +0000 (10:49 -0700)]
am c69fa275: am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev

* commit 'c69fa2751350355370a85ab0b92655b73047b91e':
  Enable time format localization in keyguard

10 years agoam dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient...
Robert Greenwalt [Mon, 14 Oct 2013 17:49:34 +0000 (10:49 -0700)]
am dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

* commit 'dcc31551f80500a096b8eb95f7f0670b4c19fd95':
  Make Wifi Scans more heap-efficient

10 years agoam 92756b89: (-s ours) am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import...
Baligh Uddin [Mon, 14 Oct 2013 17:49:30 +0000 (10:49 -0700)]
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

10 years agoam 93a1154f: (-s ours) am a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import...
Baligh Uddin [Mon, 14 Oct 2013 17:49:24 +0000 (10:49 -0700)]
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

10 years agoam 480f83cf: (-s ours) am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import...
Baligh Uddin [Mon, 14 Oct 2013 17:49:20 +0000 (10:49 -0700)]
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

10 years agoam e6cc525f: (-s ours) am b43e0ead: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 14 Oct 2013 17:49:18 +0000 (10:49 -0700)]
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

10 years agoam e3e194ae: (-s ours) am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 14 Oct 2013 17:49:14 +0000 (10:49 -0700)]
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

10 years agoam 9f93c67c: (-s ours) am adb1b5b4: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 14 Oct 2013 17:49:11 +0000 (10:49 -0700)]
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

10 years agoam b780082c: (-s ours) am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 14 Oct 2013 17:49:08 +0000 (10:49 -0700)]
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

10 years agoam 455e95eb: am 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the...
Svetoslav [Mon, 14 Oct 2013 17:49:05 +0000 (10:49 -0700)]
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.

10 years agoam e0db6fc6: am 8d56f667: am 709129ba: Merge "Document special case in hasOverlapping...
Chris Craik [Mon, 14 Oct 2013 17:48:57 +0000 (10:48 -0700)]
am e0db6fc6: am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev

* commit 'e0db6fc6847f0404b704c179d4795b27d9025693':
  Document special case in hasOverlappingRendering

10 years agoam 4f2bcde9: am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard...
Jim Miller [Mon, 14 Oct 2013 17:48:30 +0000 (10:48 -0700)]
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

10 years agoam 5f7f97e0: am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev
Jeff Sharkey [Mon, 14 Oct 2013 17:48:23 +0000 (10:48 -0700)]
am 5f7f97e0: am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev

* commit '5f7f97e01507c6d5860388dfea860e05c2a3616e':
  Fix spelling.

10 years agoam 00040103: am 8e80d1f9: am 33021d95: Merge "Adding timeout if the current printer...
Svetoslav [Mon, 14 Oct 2013 17:48:19 +0000 (10:48 -0700)]
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.

10 years agoresolved conflicts for merge of 94b51810 to master
Matthew Williams [Mon, 14 Oct 2013 17:39:41 +0000 (10:39 -0700)]
resolved conflicts for merge of 94b51810 to master

Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 14 Oct 2013 16:22:54 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 16:17:56 +0000 (09:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib9ba58f8e1486581d71443234db99a12f925cf0a
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 14 Oct 2013 16:15:14 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 16:13:55 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib34e81399bfc7c5867fcc060af7d5487485a2855
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Oct 2013 16:12:27 +0000 (09:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I734c073236b4d50576d962b23f4b50abfccec16e
Auto-generated-cl: translation import

10 years agoFix minor thread corectness issue in NetworkInfo
Narayan Kamath [Fri, 11 Oct 2013 12:43:30 +0000 (13:43 +0100)]
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

10 years agoam 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev
Svetoslav Ganov [Sun, 13 Oct 2013 00:37:38 +0000 (17:37 -0700)]
am 79ddf835: am bececbfa: Merge "Printed document size not persisted." into klp-dev

* commit '79ddf835227283979dc353e57711a9d6dff8edb0':
  Printed document size not persisted.

10 years agoam bfc8edcf: am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a...
Svetoslav Ganov [Sun, 13 Oct 2013 00:37:35 +0000 (17:37 -0700)]
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.

10 years agoam bececbfa: Merge "Printed document size not persisted." into klp-dev
Svetoslav Ganov [Sun, 13 Oct 2013 00:34:47 +0000 (17:34 -0700)]
am bececbfa: Merge "Printed document size not persisted." into klp-dev

* commit 'bececbfae675055aa60ea21c5b8bd3dbb8acdbac':
  Printed document size not persisted.

10 years agoam 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if...
Svetoslav Ganov [Sun, 13 Oct 2013 00:34:43 +0000 (17:34 -0700)]
am 63ce2019: Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev

* commit '63ce201963339d937cf66fed7870356291dc57ad':
  Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.

10 years agoMerge "Printed document size not persisted." into klp-dev
Svetoslav Ganov [Sun, 13 Oct 2013 00:32:47 +0000 (00:32 +0000)]
Merge "Printed document size not persisted." into klp-dev

10 years agoMerge "Fail only scheduled print jobs, i.e. handed to a service, if the service is...
Svetoslav Ganov [Sun, 13 Oct 2013 00:32:12 +0000 (00:32 +0000)]
Merge "Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled." into klp-dev

10 years agoam e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProv...
Joe Malin [Sat, 12 Oct 2013 22:56:42 +0000 (15:56 -0700)]
am e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class

* commit 'e8117b64ee8580892e9fdad76bbd152bcf123c96':
  DOC CHANGE: FileProvider training class

10 years agoam a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training...
Joe Malin [Sat, 12 Oct 2013 22:55:23 +0000 (15:55 -0700)]
am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class

* commit 'a2c64bb629554279fb7458c53d7f97f4d2fea37f':
  DOC CHANGE: FileProvider training class

10 years agoam 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class
Joe Malin [Sat, 12 Oct 2013 22:52:19 +0000 (15:52 -0700)]
am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class

* commit '91245730a103f526a7c3cc0f4f6c3a03c1094703':
  DOC CHANGE: FileProvider training class

10 years agoam ca338777: am 45edbb70: DOC CHANGE: FileProvider training class
Joe Malin [Sat, 12 Oct 2013 22:49:09 +0000 (15:49 -0700)]
am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class

* commit 'ca3387776037cd00b7bd7114535e3f3365cf3464':
  DOC CHANGE: FileProvider training class

10 years agoam 45edbb70: DOC CHANGE: FileProvider training class
Joe Malin [Sat, 12 Oct 2013 22:46:02 +0000 (15:46 -0700)]
am 45edbb70: DOC CHANGE: FileProvider training class

* commit '45edbb701ac44891aa07a403a55ee2393da9b25f':
  DOC CHANGE: FileProvider training class

10 years agoPrinted document size not persisted.
Svetoslav Ganov [Sat, 12 Oct 2013 20:18:12 +0000 (13:18 -0700)]
Printed document size not persisted.

We persist ongoing print jobs so they can be restarted if the device
dies. The data size of the printed document was not persisted to disc.

bug:11199352

Change-Id: I53ef1ee285aa4808917dd6a5c7335226aba1ef0a

10 years agoFail only scheduled print jobs, i.e. handed to a service, if the service is disabled.
Svetoslav Ganov [Sat, 12 Oct 2013 19:35:41 +0000 (12:35 -0700)]
Fail only scheduled print jobs, i.e. handed to a service, if the service is disabled.

When a print service is disabled we assume all print jobs for it failed as we have
no way to know what happens to them. However we are also failing created print jobs,
i.e. ones not given to the service. Such jobs are in process of construction and
the print dialog is up. We should not fail such jobs as the dialog can still modify
their state and potentially select a print from a different service. Therefore, we
leave them alone and they will be failed if when constructed are passed to a
disabled/uninstalled service.

bug:11197432

Change-Id: Ie4fe54327e3e25776b1dd572be2dfafdd700c2e5

10 years agoam 2c1934d3: am 5a783173: Merge "Test for hidden keyguard before waiting for it....
Craig Mautner [Sat, 12 Oct 2013 04:58:55 +0000 (21:58 -0700)]
am 2c1934d3: am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev

* commit '2c1934d302730bf4dc9190bc600bee180067df3b':
  Test for hidden keyguard before waiting for it.

10 years agoam 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev
Craig Mautner [Sat, 12 Oct 2013 04:56:55 +0000 (21:56 -0700)]
am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev

* commit '5a7831733be2040fde78027fe2f7eca4f4cc2e28':
  Test for hidden keyguard before waiting for it.

10 years agoMerge "Test for hidden keyguard before waiting for it." into klp-dev
Craig Mautner [Sat, 12 Oct 2013 04:54:42 +0000 (04:54 +0000)]
Merge "Test for hidden keyguard before waiting for it." into klp-dev

10 years agoTest for hidden keyguard before waiting for it.
Craig Mautner [Sat, 12 Oct 2013 04:43:06 +0000 (21:43 -0700)]
Test for hidden keyguard before waiting for it.

Now that non-null window tokens are coming in in additional situations
(ag/372453) we have to look at whether the keyguard is hidden before
deciding to wait for it.

Fixes bug 1187500.

Change-Id: Ie89d5334ab3d0f5b8f2cf8c87fef84a9b6392b72

10 years agoam 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keygu...
Jim Miller [Sat, 12 Oct 2013 04:35:24 +0000 (21:35 -0700)]
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

10 years agoam 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw...
Jim Miller [Sat, 12 Oct 2013 04:32:35 +0000 (21:32 -0700)]
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

10 years agoMerge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev
Jim Miller [Sat, 12 Oct 2013 04:29:00 +0000 (04:29 +0000)]
Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev

10 years agoFix problem where PhoneWindowManager waits for keyguard to draw
Jim Miller [Sat, 12 Oct 2013 04:03:22 +0000 (21:03 -0700)]
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

10 years agoam 6b5fc882: am 166434ec: Merge "When removing a task that was on home, put home...
Craig Mautner [Sat, 12 Oct 2013 02:48:12 +0000 (19:48 -0700)]
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.

10 years agoam 166434ec: Merge "When removing a task that was on home, put home on top." into...
Craig Mautner [Sat, 12 Oct 2013 02:44:31 +0000 (19:44 -0700)]
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.

10 years agoMerge "When removing a task that was on home, put home on top." into klp-dev
Craig Mautner [Sat, 12 Oct 2013 02:42:37 +0000 (02:42 +0000)]
Merge "When removing a task that was on home, put home on top." into klp-dev

10 years agoam 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into...
Jim Miller [Sat, 12 Oct 2013 01:11:05 +0000 (18:11 -0700)]
am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev

* commit '8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9':
  Enable time format localization in keyguard

10 years agoam dc70340d: Merge "Enable time format localization in keyguard" into klp-dev
Jim Miller [Sat, 12 Oct 2013 01:08:00 +0000 (18:08 -0700)]
am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev

* commit 'dc70340d48eeddf4aa92a4d199179cde269c5bd4':
  Enable time format localization in keyguard

10 years agoMerge "Enable time format localization in keyguard" into klp-dev
Jim Miller [Sat, 12 Oct 2013 01:00:24 +0000 (01:00 +0000)]
Merge "Enable time format localization in keyguard" into klp-dev

10 years agoEnable time format localization in keyguard
Jim Miller [Fri, 11 Oct 2013 23:21:45 +0000 (16:21 -0700)]
Enable time format localization in keyguard

Fixes bug 11173871

Change-Id: Ife44c93b01770a3349343d034fe6adb1c6d66185

10 years agoam e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev
Robert Greenwalt [Sat, 12 Oct 2013 00:37:56 +0000 (17:37 -0700)]
am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

* commit 'e9d997050bdd4cc273205f3451995f0e1e9cc3af':
  Make Wifi Scans more heap-efficient

10 years agoWhen removing a task that was on home, put home on top.
Craig Mautner [Sat, 12 Oct 2013 00:36:59 +0000 (17:36 -0700)]
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

10 years agoam 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sat, 12 Oct 2013 00:34:14 +0000 (17:34 -0700)]
am 5a531ff9: (-s ours) am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5a531ff96081c20cab087306907c406076a10ddb':
  Import translations. DO NOT MERGE

10 years agoam a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sat, 12 Oct 2013 00:34:11 +0000 (17:34 -0700)]
am a57076e8: (-s ours) am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'a57076e820731347236e69aee8abab73f2ab2ad2':
  Import translations. DO NOT MERGE

10 years agoam db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Sat, 12 Oct 2013 00:34:07 +0000 (17:34 -0700)]
am db79e4d4: (-s ours) am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'db79e4d41d21cf7daf403d680851d78c6c59a2af':
  Import translations. DO NOT MERGE

10 years agoam 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev
Robert Greenwalt [Sat, 12 Oct 2013 00:33:21 +0000 (17:33 -0700)]
am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

* commit '72dc0b439152ad1428d8713abc2b8f16911e2e7e':
  Make Wifi Scans more heap-efficient

10 years agoam b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:30:31 +0000 (17:30 -0700)]
am b43e0ead: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'b43e0eadbe144eae189ecf9f26005fd76d9f31d6':
  Import translations. DO NOT MERGE

10 years agoam 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:30:28 +0000 (17:30 -0700)]
am 8cdfa5cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '8cdfa5cd18ecf552f99c826797951a9a86c2af3c':
  Import translations. DO NOT MERGE

10 years agoam adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:30:25 +0000 (17:30 -0700)]
am adb1b5b4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'adb1b5b43f517751151835e2143d53ad3666ac8e':
  Import translations. DO NOT MERGE

10 years agoam 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:30:23 +0000 (17:30 -0700)]
am 4bb81ac8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '4bb81ac838dd910ea4a8dded676d70d4e399eed9':
  Import translations. DO NOT MERGE

10 years agoMerge "Make Wifi Scans more heap-efficient" into klp-dev
Robert Greenwalt [Sat, 12 Oct 2013 00:30:22 +0000 (00:30 +0000)]
Merge "Make Wifi Scans more heap-efficient" into klp-dev

10 years agoam ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:29:40 +0000 (17:29 -0700)]
am ea9aec27: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'ea9aec27cc792027c94fe2d1d60586efb4f85d24':
  Import translations. DO NOT MERGE

10 years agoam 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:29:36 +0000 (17:29 -0700)]
am 3c10347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '3c10347cdb84db55320d964778ff684f059cecad':
  Import translations. DO NOT MERGE

10 years agoam 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:29:33 +0000 (17:29 -0700)]
am 84f5bf82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '84f5bf823972b87be1ee0334f96a2ed3216e81a7':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:27:48 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 12 Oct 2013 00:27:34 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:27:30 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:27:15 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Sat, 12 Oct 2013 00:27:02 +0000 (00:27 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:49 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:44 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the copies and...
Svetoslav [Sat, 12 Oct 2013 00:26:42 +0000 (17:26 -0700)]
am 1f5c1f3e: am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev

* commit '1f5c1f3eee2df06ae42bc9e2bb9b5502316502cc':
  Putting the cursor at the end of the copies and range inputs.

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:28 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 00:26:23 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs...
Svetoslav [Sat, 12 Oct 2013 00:22:56 +0000 (17:22 -0700)]
am 036f05b8: Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev

* commit '036f05b8b0dabc72e6ce68372516c3d98da137e4':
  Putting the cursor at the end of the copies and range inputs.

10 years agoMerge "Putting the cursor at the end of the copies and range inputs." into klp-dev
Svetoslav [Sat, 12 Oct 2013 00:21:12 +0000 (00:21 +0000)]
Merge "Putting the cursor at the end of the copies and range inputs." into klp-dev

10 years agoam 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering...
Chris Craik [Sat, 12 Oct 2013 00:14:12 +0000 (17:14 -0700)]
am 8d56f667: am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev

* commit '8d56f667243292ed002dce81498be0e4d4a3ea59':
  Document special case in hasOverlappingRendering

10 years agoam 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev
Chris Craik [Sat, 12 Oct 2013 00:11:18 +0000 (17:11 -0700)]
am 709129ba: Merge "Document special case in hasOverlappingRendering" into klp-dev

* commit '709129ba939f9d09887506540bcbb573086b3f15':
  Document special case in hasOverlappingRendering

10 years agoMerge "Document special case in hasOverlappingRendering" into klp-dev
Chris Craik [Sat, 12 Oct 2013 00:08:08 +0000 (00:08 +0000)]
Merge "Document special case in hasOverlappingRendering" into klp-dev

10 years agoPutting the cursor at the end of the copies and range inputs.
Svetoslav [Sat, 12 Oct 2013 00:00:45 +0000 (17:00 -0700)]
Putting the cursor at the end of the copies and range inputs.

bug:10983508

Change-Id: I767876fada2f28b00283ed9140fca1a40729f38f

10 years agoDocument special case in hasOverlappingRendering
Chris Craik [Fri, 11 Oct 2013 21:17:21 +0000 (14:17 -0700)]
Document special case in hasOverlappingRendering

bug:11121809

Change-Id: I074ac47aa510bd2362cfda7dffc73930f07e925c

10 years agoDOC CHANGE: FileProvider training class
Joe Malin [Mon, 26 Aug 2013 21:55:54 +0000 (14:55 -0700)]
DOC CHANGE: FileProvider training class

Change-Id: Idad8840dec02150733f23cfefdeaf152a260f63a

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:45:22 +0000 (16:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2b2abc0ab598637d4762135082fc79c7205c332f
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:34:38 +0000 (16:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: I11e36ca2c03ecbe1a6c99a8cc4f7e4afed3e5427
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:33:07 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I68d6709509ea86f19862bb7ea5319d405dcd7c10
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:31:18 +0000 (16:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I66efc38992968ef463f4d02f1af101053adfb41e
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:28:01 +0000 (16:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: I82d4f166b346b10babd67f89f3035426e74db7dd
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:27:10 +0000 (16:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: If2d70b403a7c4ba6b6023b71bf1d66e01575278d
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:25:46 +0000 (16:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8d1fd0e44df5ea45d590e675e1f2d0afda54bc69
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:23:01 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I289f527bef7c4274b4161d2e90c8aa82dc9608a9
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:22:18 +0000 (16:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I55d4cf3dec38ad38792f855335c9fe9d2cc4624d
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Oct 2013 23:21:25 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0ca278dcf2291ed0919f46eeaff99c1ca61969ae
Auto-generated-cl: translation import

10 years agoam 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after...
Jim Miller [Fri, 11 Oct 2013 21:43:55 +0000 (14:43 -0700)]
am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev

* commit '51f2d8ef9da5008dda4b99157774327ed9138ab8':
  Delay all widget additions in keyguard until after boot completes

10 years agoam 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes...
Jim Miller [Fri, 11 Oct 2013 21:40:57 +0000 (14:40 -0700)]
am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev

* commit '11def8f06a3c03a0056e9fa010b28622d9d88d2b':
  Delay all widget additions in keyguard until after boot completes

10 years agoMerge "Delay all widget additions in keyguard until after boot completes" into klp-dev
Jim Miller [Fri, 11 Oct 2013 21:38:04 +0000 (21:38 +0000)]
Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev