44278 Commits

Author SHA1 Message Date
Dianne Hackborn
5f86b90b8a Merge "Fix issue #10848916: "Always" button is not working." into klp-dev 2013-09-24 21:46:17 +00:00
Alan Viverette
4e10483de3 am 6bc7cacf: Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev
* commit '6bc7cacfc8c34512278460028b7f6f0a4be220b4':
  Fix NPE in PopupMenu.getDragToOpenListener()
2013-09-24 14:33:50 -07:00
Rob Tsuk
dbef227670 Replace blue highlight feedback with gray.
Change-Id: Idf95742261cdc19b25b0aa5e1e8c8cb9685e7fe5
2013-09-24 14:33:12 -07:00
Alan Viverette
6bc7cacfc8 Merge "Fix NPE in PopupMenu.getDragToOpenListener()" into klp-dev 2013-09-24 21:28:56 +00:00
Dianne Hackborn
6d8dfbd814 Fix issue #10848916: "Always" button is not working.
The problem was that the ResolverActivity filters some activities
out of the list it shows, but it uses that display list as the
list of components the preference is set against when ultimately
setting it on the package manager...  but that filtered list is *not*
the right component set, since it is not the same as the package
manager's view on it.

The fix here is to retain the original set of matching components
and use that when setting the preferred activity.  Note that this
does mean that in very unusual cases where filtering is happeing
(such as one of the activities not being exported but being seen
as a possible completion from another app), then you will be setting
the preference for the complete set.  Ultimately we probably need
to have the package manager apply these filtering rules up-front so
this is all consistent, but this is a very rare case so not that
important.

And then most of the change here is just improving the debug
output for intent resolution.

Change-Id: Ie35ac2c05a45946439951bbf41433c8b7de79c05
2013-09-24 14:16:38 -07:00
Chet Haase
5c69fd7d36 am cfdc0369: Merge "Disable ActionBar usage of transitions" into klp-dev
* commit 'cfdc0369f133787ed60015610016e9e53964bd77':
  Disable ActionBar usage of transitions
2013-09-24 14:01:48 -07:00
Chet Haase
cfdc0369f1 Merge "Disable ActionBar usage of transitions" into klp-dev 2013-09-24 20:58:40 +00:00
Svetoslav
d454beb854 am 0d38d0b4: Merge "Multiple printer discovery session instances and other bugs." into klp-dev
* commit '0d38d0b42fba7dc50454d5c0652cf351c58a9db6':
  Multiple printer discovery session instances and other bugs.
2013-09-24 13:40:02 -07:00
Svetoslav
0d38d0b42f Merge "Multiple printer discovery session instances and other bugs." into klp-dev 2013-09-24 20:37:59 +00:00
Alan Viverette
36055c3396 am e1cb9acc: Merge "Update AdapterView.performItemClick() documentation" into klp-dev
* commit 'e1cb9accf2077833c96e748150d0aee8e05cb10a':
  Update AdapterView.performItemClick() documentation
2013-09-24 11:32:41 -07:00
Alan Viverette
e1cb9accf2 Merge "Update AdapterView.performItemClick() documentation" into klp-dev 2013-09-24 18:28:01 +00:00
Alan Viverette
99d72497d3 Fix NPE in PopupMenu.getDragToOpenListener()
BUG: 10912382
Change-Id: I206e697b4781c4d03ebc01aa675511d89c1656af
2013-09-24 11:27:08 -07:00
Baligh Uddin
71a5f3cefe Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-24 14:59:07 +00:00
Martin Kosiba
dc7053be9f am 4e31b804: Merge "Update WebView documentation section about zoom." into klp-dev
* commit '4e31b8046da047d5286532776d6d169e09d21ce5':
  Update WebView documentation section about zoom.
2013-09-24 02:52:20 -07:00
Martin Kosiba
4e31b8046d Merge "Update WebView documentation section about zoom." into klp-dev 2013-09-24 09:49:22 +00:00
Svetoslav
b5f180608d Multiple printer discovery session instances and other bugs.
1. The fused printers provider was dropping on the floor received printers
    if it was not active. It is in fact a loaded and if not active it should compute
    the printers and not deliver them until activated. This fixes an issue where
    opening the print dialog, then enabling a print service results in the printers
    reported by the service not showing up in the print dialog.

2. Printer discovery session was created twice which leads to incorrect behavior
    as the pint system is designed around the contract that there is a single
    printer discovery session per service at a time. This was possible due to an
    incorrect initialization of a member variable resulting in double session creation
    when the print service is connected.

3. When a print service is enabled during discovery we did not use the correct
    condition to start printer discovery resulting in starting it all the time even if
    not needed. Also if some of the printers that had to be tracked are reported
    by the service just enabled (typically historical printers) we did not ask the
    service to start tracking them.

4. Removed some logging.

bug:10903343

Change-Id: I46c049471a4b099fc668df3aee2aaedc8d7786ac
2013-09-23 23:41:12 -07:00
Zhijun He
ff704b63dd am 0d9fdc24: Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev
* commit '0d9fdc245172bb5c46eb21094e384d95da1a46df':
  Camera2: replace EDQUOT with EUSERS
2013-09-23 19:33:07 -07:00
Zhijun He
0d9fdc2451 Merge "Camera2: replace EDQUOT with EUSERS" into klp-dev 2013-09-24 02:28:22 +00:00
David Christie
f6a63c9244 am fe538cb6: Merge "Fix broken method WorkSource.set (names aren\'t applied)." into klp-dev
* commit 'fe538cb60ea9032645e8bcdcb5ebbe5810626cff':
  Fix broken method WorkSource.set (names aren't applied).
2013-09-23 19:00:33 -07:00
Jeff Sharkey
94bf4d69f2 am 0156a379: Merge "Allow saving to Downloads." into klp-dev
* commit '0156a379e21621d2724635eb96f37a81efc7be06':
  Allow saving to Downloads.
2013-09-23 19:00:01 -07:00
Amith Yamasani
32a2775e52 am 85f77c2b: Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev
* commit '85f77c2b8b46a52544ab9305a8c4cf9a36923013':
  Unmarshall PFDs properly when hand-crafting interface stubs
2013-09-23 18:59:57 -07:00
John Spurlock
237b84287e am fac17cc7: Merge "Introduce transparent bars to the keyguard." into klp-dev
* commit 'fac17cc7b1e8c3b73a457c2d85e2f832461fb26e':
  Introduce transparent bars to the keyguard.
2013-09-23 18:59:45 -07:00
Derek Sollenberger
fad41c8fd1 am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev
* commit '5db1f5aaacf01e176f2463c212da72eaafc79165':
  Fix Java API error where requesting another style for a provided family fails
2013-09-23 18:59:24 -07:00
Dianne Hackborn
8d4816d8fc am a3abca90: Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev
* commit 'a3abca90aea1b0b6ab0be56b3ec008b91dfc090f':
  Issue #10461551: KLP API Review: AppOpsManager
2013-09-23 18:58:42 -07:00
David Christie
dd3a021f4a Fix broken method WorkSource.set (names aren't applied).
Change-Id: I89273b99e312e48adc10debbb4e40d8684cceb23
2013-09-23 16:01:08 -07:00
Chet Haase
d8d7c38533 Disable ActionBar usage of transitions
Various artifacts across apps were coming from ActionBar's use of
the new transitions framework. Disabling transitions for now to get
things back to a more stable state.

Also, fixed some related bugs in transitions themselves, including
a change in TextChange to account for text selection, which was causing
errors in Keep's SearchView.

Issue #10860557 TextChange animator may old stale value
Issue #10819685 sometimes icons are lighter
Issue #10750525 Share and Settings icons overlap when stopping slideshow
Issue #10839551 Sometimes the search text box is right-aligned in Keep
Issue #10727484 Cursor incorrectly positioned after entering first letter during search action in keep app

Change-Id: Iad7cbf3297e18018308b8148b3519b032e63dace
2013-09-23 14:49:39 -07:00
Jeff Sharkey
0156a379e2 Merge "Allow saving to Downloads." into klp-dev 2013-09-23 21:28:07 +00:00
Jeff Sharkey
b180a65d41 Allow saving to Downloads.
Uses new column to mark writability.  Also filter file selection in
create mode to only allow writable files.

Bug: 10667164, 10893268
Change-Id: I90f74efbb7ac634fbdb3cc02a904a96a434d3605
2013-09-23 14:23:45 -07:00
Amith Yamasani
85f77c2b8b Merge "Unmarshall PFDs properly when hand-crafting interface stubs" into klp-dev 2013-09-23 21:14:51 +00:00
John Spurlock
fac17cc7b1 Merge "Introduce transparent bars to the keyguard." into klp-dev 2013-09-23 20:37:29 +00:00
Amith Yamasani
c2be0d6183 Unmarshall PFDs properly when hand-crafting interface stubs
ParcelFileDescriptors now carry an optional socket fd to communicate
close events. So, make sure that the correct creator is called when
reconstructing parceled PFDs.

Bug: 10759966
Change-Id: Ic6b9ffb8cb7af5f3a12440def595f74682231866
2013-09-23 13:35:46 -07:00
Zhijun He
9bd5f1e6df Camera2: replace EDQUOT with EUSERS
Bug: 10838065
Change-Id: Ib450fcfffecec210c7f11842bf024abd7889bad7
2013-09-23 13:07:57 -07:00
John Spurlock
257f283b0e Introduce transparent bars to the keyguard.
Driven by a new framework config bool. Tested on all layouts,
but disabled by default.  Can be enabled with a config overlay.

(Sliding/MultiPane)ChallengeLayout have custom measure/layout
logic that peeks at the root view's padding (!).  So we must keep
the root view's padding = system window insets. However, we need
the scrims + the fullscreen camera widget preview to use the entire
display size if the bars are transparent.

So the approach is to maintain the root view's
(KeyguardViewManager$ViewManagerHost) padding as before via
setFitsSystemWindows(true) but allow non KeyguardHostViews to
extend into the padding if bars are transparent via a custom
measure/draw on the root view.

KeyguardHostView background + challege scrims moved up to the
root view.

Also:
- Remove logspam line for fixed bug.

- Fix status bar staying opaque on interaction on secure keyguard.

Known issues:
- Nav bar blip dismissing global actions, keyguard app widget picker
bars are opaque.  Both will use the new inherit flag once it exists.

- Emergency dialer layout dance, will be fixed in the phone project.

Bug:10606085
Change-Id: I2648b4ee9a54a67324ce9dcbab976ad4da4bbcfa
2013-09-23 15:59:15 -04:00
Derek Sollenberger
5db1f5aaac Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev 2013-09-23 19:14:57 +00:00
Dianne Hackborn
a3abca90ae Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 2013-09-23 16:36:29 +00:00
Dianne Hackborn
9bb0ee9131 Issue #10461551: KLP API Review: AppOpsManager
Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8
2013-09-23 09:35:21 -07:00
Baligh Uddin
3bb62b4cfd Import translations. DO NOT MERGE
Change-Id: If36e81ae6777299362efab7889f6f4013ee544d4
Auto-generated-cl: translation import
2013-09-23 09:26:49 -07:00
Derek Sollenberger
fe8e21fd80 Fix Java API error where requesting another style for a provided family fails
Internally the API uses the same code path as SkTypeface::CreateFromName which
returns NULL if the requested style is not supported by the existing family.
However, the existing Java API expects that we return the default font in the
requested style so this CL ensures that we do.

bug: 10860066
Change-Id: Ide3a0cc24015e97fa35aef283b42e7d7d11edd9c
2013-09-23 09:22:56 -04:00
Jeff Sharkey
b8a48da2a7 am 5e1a5e5b: Merge "Create unique files, root ordering, UI bugs." into klp-dev
* commit '5e1a5e5bad475696e842addceb7dd6a519879f98':
  Create unique files, root ordering, UI bugs.
2013-09-22 12:57:20 -07:00
Jeff Sharkey
5e1a5e5bad Merge "Create unique files, root ordering, UI bugs." into klp-dev 2013-09-22 19:55:19 +00:00
Igor Murashkin
8c87117588 am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
* commit '3ba21e979524367631de70dfc82075693d9c616d':
  camera2: Rename CameraProperties to CameraCharacteristics
2013-09-22 09:55:52 -07:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
2013-09-21 21:01:32 -07:00
Igor Murashkin
78d5286e07 am ca833c38: Merge "camera2: Add capture sequences and capture failures" into klp-dev
* commit 'ca833c389b3cc2f95f27fe7782d0bebb8b36d660':
  camera2: Add capture sequences and capture failures
2013-09-21 19:49:34 -07:00
Igor Murashkin
ca833c389b Merge "camera2: Add capture sequences and capture failures" into klp-dev 2013-09-22 02:44:06 +00:00
Wink Saville
86ad8e6871 am 56065891: Merge commit \'53221120\' into fix-merge-conflict
* commit '56065891abf383b0409ae595437dcb0ea132e32b':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 14:36:13 -07:00
Jeff Sharkey
5545f56f75 Create unique files, root ordering, UI bugs.
When a file already exists on disk, try adding a counter suffix to
make a unique name.  Move services near top of roots list, just below
recents.  Remove "Documents" root.

Increase number of recents allowed from single provider, and add more
logging to diagnose wedged loaders.

When launching GET_CONTENT apps, wait for successful result before
relaying result; canceled requests now return to DocumentsUI.

Add CloseGuard to ContentProviderClients, since leaked instances can
keep the remote process alive.

Fix UI bug around trailing breadcrumbs.  Fix bug that dropped Recents
from roots list.  Add up action to Settings activity.  Give our
activity a default icon while waiting for async roots to load.

Bug: 10818683, 10819461, 10819461, 10819196, 10860199
Change-Id: I7b9e26b1cf8353dd3175458b23da2b4bda6c5831
2013-09-21 14:07:16 -07:00
Wink Saville
56065891ab Merge commit '53221120' into fix-merge-conflict
* commit '53221120':
  Do not always call setIsConnectedToProvisioningNetwork(false)

Conflicts:
	core/java/android/net/MobileDataStateTracker.java

Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
2013-09-21 11:52:42 -07:00
Wink Saville
5322112004 am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit 'ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 11:33:53 -07:00
Wink Saville
ab8cabf1d3 am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit '1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 11:30:33 -07:00
Wink Saville
1e4f461839 Do not always call setIsConnectedToProvisioningNetwork(false)
Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.

If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.

Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.

Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.

Bug: 10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
2013-09-21 09:01:19 -07:00