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

5934 Commits

Author SHA1 Message Date
Dave Langemak
d220d8202e am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:34:57 -08:00
Dave Langemak
c04aa87e4a Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 2013-11-19 16:33:22 +00:00
Jeff Sharkey
eb4dc749de am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev 
* commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829':
  Mask OOBE when filtering recent documents.
 2013-11-19 00:11:15 -08:00
Jeff Sharkey
6d0d4b5b5a Merge "Mask OOBE when filtering recent documents." into klp-dev 2013-11-19 08:08:13 +00:00
Jeff Sharkey
e2515ac296 Mask OOBE when filtering recent documents. 
There is a data ownership issue related to recent documents Cursors,
and the loader and UI threads can end up traversing the same Cursor
at runtime.  This change masks OOBE crashes caused by this race until
we have time to fix cleanly.

Bug: 11736668
Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782
 2013-11-18 17:41:56 -08:00
Baligh Uddin
4f0d1fc028 Import translations. DO NOT MERGE 
Change-Id: Iacdab3a03a17cefc52aa7d72195d0cbcc2354039
Auto-generated-cl: translation import
 2013-11-18 09:22:29 -08:00
Baligh Uddin
564fb1b8ce Import translations. DO NOT MERGE 
Change-Id: I6eea0f5a4b57c4686d1f6ff4fc137358400651b8
Auto-generated-cl: translation import
 2013-11-17 16:30:52 -08:00
Svetoslav Ganov
1a85d9fb24 Fix incorrent page range parsing when custom print options used. 
We have APIs for a print service to declare an activity with custom
print options. In this activity the service can add custom properties
as well as change the standard ones such as pages to print. The ranges
of selected pages from the custom activity was incorrectly parsed
resulting in an off by one error in what is shown to the user and as a
result getting an exception when trying to print.

bug:11719051

Change-Id: Id04c94608178895f1d47381a63133f0eba7645e1
 2013-11-15 21:52:35 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
 2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen. 
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
 2013-11-15 00:29:43 -08:00
Baligh Uddin
2785892dbf Import translations. DO NOT MERGE 
Change-Id: I6d1283da139ad2ef60213d83d7ac00939a4bfc04
Auto-generated-cl: translation import
 2013-11-14 22:32:08 -08:00
Svetoslav
d2b27cbde9 am 6874bfe1: Merge "Created print jobs should not be persisted until they are queued." into klp-dev 
* commit '6874bfe19b6bc1522e07e53eb96a07e21d148b41':
  Created print jobs should not be persisted until they are queued.
 2013-11-14 22:27:35 -08:00
Svetoslav
6874bfe19b Merge "Created print jobs should not be persisted until they are queued." into klp-dev 2013-11-15 06:23:32 +00:00
Jim Miller
8d1e86d054 am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev 
* commit '1907c0d280d97776708810c9d24931aa6f818790':
  Don't show external presentation until keyguard actually shows
 2013-11-14 18:20:53 -08:00
Jim Miller
1907c0d280 Merge "Don't show external presentation until keyguard actually shows" into klp-dev 2013-11-15 02:18:08 +00:00
Svetoslav
885810de69 Created print jobs should not be persisted until they are queued. 
Print jobs in a created state should not be persisted. However,
if a print service sets the tag to a print job that is queued,
we were persisting even print jobs in a created state. This
change adds a simple check while persisting to avoid storing
created print jobs.

bug:11696785

Change-Id: Idf28f3634b91fd5bf345f376114af4ed478ed3c6
 2013-11-14 18:02:31 -08:00
Jeff Brown
2bced6dcb5 am a7a46a66: Merge "Update cast screen strings." into klp-dev 
* commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c':
  Update cast screen strings.
 2013-11-14 17:31:32 -08:00
Jeff Brown
a7a46a66fa Merge "Update cast screen strings." into klp-dev 2013-11-15 01:28:59 +00:00
John Spurlock
caf21486df am 68837c4e: Merge "Avoid skipping animated status bar icon frames." into klp-dev 
* commit '68837c4eca7705cd32e3de2e7cdcd24c72ecaea7':
  Avoid skipping animated status bar icon frames.
 2013-11-14 17:16:38 -08:00
John Spurlock
68837c4eca Merge "Avoid skipping animated status bar icon frames." into klp-dev 2013-11-15 01:11:52 +00:00
Jim Miller
d31fd404e3 Don't show external presentation until keyguard actually shows 
The previous code was looking for just the display to turn off.
It should wait until keyguard is actually shown before enabling
the external presentations.

Fix for bug 11694904

Change-Id: Iebf3aa04fc094cd4e5c8f56bc771aca1e5921d04
 2013-11-14 16:47:26 -08:00
Jeff Brown
cef34fce3c Update cast screen strings. 
Bug: 11257292
Change-Id: Ia66152985bafcdd8ec88a3145623536a2b439b78
 2013-11-14 16:03:36 -08:00
John Spurlock
327276440f Avoid skipping animated status bar icon frames. 
By avoiding a known issue in AnimationDrawable.

Bug:11694594
Change-Id: I87540728118833f29fc7b64a5c853bc26fd19d73
 2013-11-14 19:01:20 -05:00
Jim Miller
434b4acb99 am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev 
* commit '90fa53318d4984dbebfa7964ae1f79f51a130932':
  Don't show keyguard until the device has been provisioned.
 2013-11-14 15:38:32 -08:00
Jim Miller
299422baeb Don't show keyguard until the device has been provisioned. 
This fixes a bug where we'd show keyguard on top of setup.

Fixes bug 11689756

Change-Id: I38ecdafc00fc34fdd79e3ac517042a1e5eea93de
 2013-11-14 14:15:02 -08:00
Jim Miller
5305fe3f09 am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev 
* commit '39af5a78c073d01539625a9fbbb8511747e2f048':
  Don't set up external displays from binder thread
 2013-11-13 17:50:26 -08:00
Jim Miller
378c804d65 am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev 
* commit 'c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d':
  Report keyguard as initially showing and secure until we know
 2013-11-13 17:50:18 -08:00
Jim Miller
39af5a78c0 Merge "Don't set up external displays from binder thread" into klp-dev 2013-11-14 01:47:32 +00:00
Jim Miller
c8867b2807 Merge "Report keyguard as initially showing and secure until we know" into klp-dev 2013-11-14 01:45:52 +00:00
Jim Miller
80cb9bcfc0 Don't set up external displays from binder thread 
This fixes a bug where keyguard was attempting to set up
external presentation displays from the binder thread instead
of the UI thread.  Bad dog.

Fixes bug 11676486

Change-Id: Iadbe485691acc56a41b23219fe399f7eda40cb7c
 2013-11-13 16:47:20 -08:00
Jim Miller
e5f17ab5a6 Report keyguard as initially showing and secure until we know 
This fixes a bug where an app calls KeyguardManager.isLocked()
before keyguard has had a chance to show.  The fix is to assume
keyguard is showing and secure until we know otherwise.

Fixes bug 11670159

Change-Id: Ifbe4cdf40e3b76d2069ecace940f85fa58f31187
 2013-11-13 15:40:48 -08:00
Baligh Uddin
dc0acc6f5d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 22:39:40 +00:00
Jim Miller
291b7f5615 am 3714473f: Merge "Enable fast camera transition when launched from navbar" into klp-dev 
* commit '3714473f1a077cae6eca3079da67a7dd09dcff65':
  Enable fast camera transition when launched from navbar
 2013-11-13 14:28:06 -08:00
Jim Miller
cefe47c0d3 am 9c8d56a6: Merge "Reduce camera launch time by about 250ms." into klp-dev 
* commit '9c8d56a692198a3fc1629a0407ea6027f04e9a91':
  Reduce camera launch time by about 250ms.
 2013-11-13 14:24:26 -08:00
Svetoslav Ganov
852a8895e1 am d697ba73: Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 
* commit 'd697ba73b5a5fc5dc502a117a8f06e8f1a5359b9':
  Fix NPE at PrintSpooler in Japanese environment.
 2013-11-13 14:24:23 -08:00
Jim Miller
3714473f1a Merge "Enable fast camera transition when launched from navbar" into klp-dev 2013-11-13 22:23:34 +00:00
Jim Miller
9c8d56a692 Merge "Reduce camera launch time by about 250ms." into klp-dev 2013-11-13 22:22:13 +00:00
Svetoslav Ganov
d697ba73b5 Merge "Fix NPE at PrintSpooler in Japanese environment." into klp-dev 2013-11-13 22:19:57 +00:00
Baligh Uddin
b4aac8d832 Import translations. DO NOT MERGE 
Change-Id: I11d764583416d7fb4dfc85ebe81a98b6a1267424
Auto-generated-cl: translation import
 2013-11-13 13:39:45 -08:00
Baligh Uddin
5cc3ddf16f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-13 21:04:07 +00:00
Daniel Sandler
2f4fb5eef5 am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 
* commit '31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
  Bespoke, handcrafted, artisanal assist affordance assets.
 2013-11-13 12:07:20 -08:00
Daniel Sandler
80ffcb194b am 42498417: Merge "DessertCase fixes:" into klp-dev 
* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
  DessertCase fixes:
 2013-11-13 12:07:16 -08:00
Daniel Sandler
6150abd8f9 am f554042a: Merge "Switch DeadZone to Slog." into klp-dev 
* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798':
  Switch DeadZone to Slog.
 2013-11-13 12:07:13 -08:00
Baligh Uddin
9f500fe103 Import translations. DO NOT MERGE 
Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import
 2013-11-13 11:54:28 -08:00
Keiji Ariyama
1a8c7135f0 Fix NPE at PrintSpooler in Japanese environment. 
MediaSize ID have to be upper cases.

Change-Id: I84af01dbd185df210b5ebb1de282a4091e06df05
Related-issue: https://code.google.com/p/android/issues/detail?id=61984
 2013-11-13 11:43:26 -08:00
Daniel Sandler
31f7c912f0 Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev 2013-11-13 19:32:42 +00:00
Daniel Sandler
424984172b Merge "DessertCase fixes:" into klp-dev 2013-11-13 19:32:27 +00:00
Daniel Sandler
f554042a95 Merge "Switch DeadZone to Slog." into klp-dev 2013-11-13 19:32:24 +00:00
Jeff Brown
a20f625cc1 am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev 
* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
  Finalize assets for screen casting.
 2013-11-13 08:54:27 -08:00