112621 Commits

Author SHA1 Message Date
Jason Monk
da51d36c74 Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev 2013-09-26 23:23:19 +00:00
Scott Main
ef4e5e6182 am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit '194925f9e894d35991920edbaa0681c1aea48120':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-26 16:23:06 -07:00
Scott Main
194925f9e8 am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit 'a8f519ff9cb38e97db34f5a7bac95a9e09ed5ade':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-26 16:20:41 -07:00
Scott Main
a8f519ff9c add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Change-Id: I196ac5955477cd822bbf78a9cd4fd53a3d8fbd5f
2013-09-26 16:17:57 -07:00
Raph Levien
8079ae1a2d Fix for Text fading on RTL app names is done at the beginning...
This is a fix for bug 10918591 [Android][bidid][HH] "Text fading on RTL
app names is done at the beginning of the text, not at the end."

The old logic for getting the fade edge was not symmetric with respect
to the text direction - when the text was centered, it basically
always placed the fade edge at the left, which of course is appropriate
for LTR text but not RTL. This patch makes the two paths symmetric
and sensitive to text direction.

Change-Id: Ief7604aeb659d474864468d2f102a53f5b43d09e
2013-09-26 16:17:11 -07:00
Jason Monk
d443479a45 Fix Sending PAC Broadcast before downloaded
The PacManager now waits until the local proxy is bound and the PAC file
is downloaded before sending out the proxy broadcast.

Bug: 10895515
Change-Id: Iaa7fc0989b52453aeeb720b44df0fca0fcb959ca
2013-09-26 23:06:32 +00:00
Adam Powell
54c94dea8a Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
Allow calling code to specify left/right/start/end gravity when
showing a popup attached to an anchor. This allows easy alignment of
either the right or left edges of the popup and anchor view.

Bug 10728401

Change-Id: Ie0844a04ea0576fa67b0972f5873aaa4c5b823f6
2013-09-26 15:49:27 -07:00
Jim Miller
398d7f6186 Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev 2013-09-26 22:27:15 +00:00
Jim Miller
1de95fb42b Remove unused views when we return to keyguard
This fixes a bug where launching the camera would move
the camera view to the root hierarchy.  In insecure mode, a
subsequent dismiss() comes in and tears down the view hierachy
before the event can be processed, which left the view in the
root hierarchy.

The fix is to remove all children when we reconstruct keyguard.

Fixes bug 10640209

Change-Id: Ia67a93cd219d2b906b6e3bdd04cc355eeffe857e
2013-09-26 15:09:28 -07:00
Romain Guy
33ed738d49 Expose View.executeHardwareAction()
Bug #10911502

Views creating hardware resources need a way to safely interact
with the hardware. This new method invokes HardwareRenderer.safelyRun()
which executes a Runnable after making sure the hardawre rendering
context is in a valid state.

With the OpenGL backend, executeHardwareAction() tries to call
eglMakeCurrent() if needed. This method is not guaranteed to
work.

Change-Id: I38ec65132eeba85605cffb1a6de12b7a0184e213
2013-09-26 22:01:01 +00:00
Craig Mautner
c449613ec6 Merge "Revert behavior to perform onResume." into klp-dev 2013-09-26 21:43:24 +00:00
Victoria Lease
a4eb894a55 Merge "clarify Paint flag docs" into klp-dev 2013-09-26 21:40:55 +00:00
Alan Viverette
647e6bd997 Add warning about using MergeCursor in CursorAdapter
BUG: 10606539
Change-Id: I0b0835e2dadb5e3800edd32619c433f9e764cd6e
2013-09-26 14:38:14 -07:00
David Friedman
2e7c8e952c Docs: Changed
// Send the negative button event back to the host activity
mListener.onDialogPositiveClick(NoticeDialogFragment.this);

to

// Send the negative button event back to the host activity
mListener.onDialogNegativeClick(NoticeDialogFragment.this);

Bug: 10641712
Change-Id: Ib6af3318928c56cf9d12adbffbd7edff23f116db
2013-09-26 14:28:51 -07:00
Craig Mautner
5314a40b96 Revert behavior to perform onResume.
Back out changes from CLs ag/363992 and ag/363859. These introduced
the bugs found in bug 10917435 which is now fixed. Note that backing
out these changes reintroduces bug 10732489.

Change-Id: Ic5105dd4cfc8bf79c6f06188283d1ee3680c370c
2013-09-26 14:24:02 -07:00
Christopher Tate
4e9c7d8ba3 Merge "Sigh." into klp-dev 2013-09-26 21:10:39 +00:00
Svetoslav Ganov
c6afd813ac Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev 2013-09-26 21:10:19 +00:00
Svetoslav Ganov
2c854022bf Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev 2013-09-26 21:09:25 +00:00
Amith Yamasani
d2534f8c05 Merge "Don't remove restrictions files that are valid" into klp-dev 2013-09-26 21:02:10 +00:00
Svetoslav Ganov
0ce3e8743c Choosing default paper size for the "Save to PDF" fake printer
Change-Id: I1e2eb73fd1eb3b1e9812155b69b94cba261243c2
2013-09-26 13:54:49 -07:00
Victoria Lease
8dc7d5ea26 clarify Paint flag docs
Bug: 10460797
Change-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7
2013-09-26 13:40:47 -07:00
Chet Haase
b7a7fc9d23 Make fading transitions work better
Previously, a Fade transition would only affect a view if its
parent hierarchy was not also affected between the start/end states.
This caused problems for views which were removed from their parents
between scenes when their parents' visibility also changed between those
scenes. The effect would be that the transition would fade the parent...
but the child would no longer be in that parent, so the user would just see the
child view blink out.

This fix ensure that views are faded appropriately by fading them
regardless the parent hierarchy; if a view is removed from its
parent, fade it out.

Additionally, if that view has not been removed from its parent, but
its parent is no longer parented *and* scene being
transitioned from is based on a layout resource file (and thus
the views are considered temporary after transitioning), then it is
removed from its parent to be faded out in the overlay.

Also, renamed TextChange to ChangeText to be more consistent with
other transition class names.

Change-Id: I4e0e7dfc9e9d95c7a4ca586534b6d204c4f3bae0
2013-09-26 13:38:12 -07:00
Jeff Sharkey
8c6c04197e Merge "Tighten flags enforcement, API to test Uris." into klp-dev 2013-09-26 20:33:29 +00:00
Zhijun He
8f4e289f8c Merge "Camera2: Fix focusRange type" into klp-dev 2013-09-26 20:28:19 +00:00
Christopher Tate
ae269d5727 Sigh.
Bug 10746233

Change-Id: I18c84f2bd53a511fc86be42b5d72062650e5b289
2013-09-26 13:23:43 -07:00
Amith Yamasani
fc95e70abd Don't remove restrictions files that are valid
This fixes a bug in parsing the package name from a file name. The suffix
was not taken into account, resulting in all restrictions files being
removed on switching to a user.

Bug: 10947554
Change-Id: I62725bbbdc0e15609872de3896130d4acbc35386
2013-09-26 13:20:17 -07:00
Jeff Sharkey
ee2f7df9ee Tighten flags enforcement, API to test Uris.
Check and throw if callers request invalid grant flags.  Add API to
test if a Uri is backend by a DocumentsProvider.

Bug: 10919391, 10935608
Change-Id: Ifa6afefb95983558c8c64dc15ddf650e9fe07080
2013-09-26 13:14:45 -07:00
John Spurlock
91949b20c9 Merge "New battery meter view bolt shape + color." into klp-dev 2013-09-26 20:10:20 +00:00
Vineeta Srivastava
aeaecaccca Merge "telephony: Set roam though same named operator" into klp-dev 2013-09-26 19:59:20 +00:00
Marco Nelissen
2c70299029 Merge "Fix logic in fallback ringtone handling" into klp-dev 2013-09-26 19:56:13 +00:00
Sungmin Choi
3cf4dbaba7 telephony: Set roam though same named operator
Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
2013-09-26 12:53:48 -07:00
Daniel Sandler
8475a74bdd Would you like a dessert?
Feel free to browse our lovely dessert case. You're sure to
find something to your liking; we have many familiar
favorites, as well as some rather rare and exotic pastries.

Bug: 10240151
Change-Id: I0f423e5993c049409d89b6be304f57a86974f15a
2013-09-26 15:51:45 -04:00
Scott Main
9f54a5834a am 6d49f698: am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '6d49f6980bff8c4ec15db169128b439c0b732ac5':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
2013-09-26 12:51:09 -07:00
Scott Main
6d49f6980b am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit 'ce57e1a6f373c4f1c39b048adc1f2bbe6232be0e':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
2013-09-26 12:48:04 -07:00
Scott Main
ce57e1a6f3 am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
* commit '4c9ed63cc66c5558e3b0330b17df92e99290eaf7':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
2013-09-26 12:45:22 -07:00
Marco Nelissen
19a4671b10 Fix logic in fallback ringtone handling
The existing code would only play a fallback ringtone if the requested
ringtone was one of the three ringtone uris that are defined by settings,
and it wasn't set to "silent".
Now it also plays the fallback for custom ringtone uris.

b/10891718

Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
2013-09-26 12:44:55 -07:00
Scott Main
fc8a982e55 am 95fdf3d9: am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668
* commit '95fdf3d91fc49956daea8cdaf30f7a578fdbeb8b':
  update action bar icon pack with xxhdpi assets bug: 9761668
2013-09-26 12:42:26 -07:00
John Spurlock
e54eb7f944 Merge "Add RTL versions of wimax status bar icons." into klp-dev 2013-09-26 19:41:56 +00:00
Scott Main
95fdf3d91f am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668
* commit 'a37c524ffc4a0387fac79e8ad4ab6319eeb99fa8':
  update action bar icon pack with xxhdpi assets bug: 9761668
2013-09-26 12:40:29 -07:00
Scott Main
4c9ed63cc6 update the nav drawer lesson to link to new action bar icon pack,
which now includes the nav drawer icon

Change-Id: I0d6452fa5b4856b96268763141d74dd8f83c221d
2013-09-26 12:39:27 -07:00
Scott Main
a37c524ffc am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668
* commit '54f8facfc8d103e6dd7211bbabfe36d083798731':
  update action bar icon pack with xxhdpi assets bug: 9761668
2013-09-26 12:37:44 -07:00
John Spurlock
9e6f69123c Add RTL versions of wimax status bar icons.
Bug:7968781
Change-Id: I9f03d92f7682416ad4b99ecfb18317842b85163d
2013-09-26 15:36:31 -04:00
Svetoslav Ganov
cb247866ac PackageManager#queryIntentServices breaks its contract.
PackageManager#queryIntentServices javadoc contract states that this
method (and the like) never returns null, rather an empty list if
no result is found. However, there is a path in the PackageManagerService
that returns null, thus breaking the contract. Handling the null list
explicitly.

bug:10930560

Change-Id: I708c51b8b7075e529145c8b0bf159efd6b697532
2013-09-26 12:34:49 -07:00
Scott Main
54f8facfc8 update action bar icon pack with xxhdpi assets
bug: 9761668

Change-Id: Ib76dec4f90052c803c224f6489876644ee2f44ab
2013-09-26 12:30:30 -07:00
Svetoslav Ganov
5cab967bf2 Merge "Adding hidden APIs for observing the print jobs state." into klp-dev 2013-09-26 19:22:20 +00:00
Svetoslav Ganov
3adc49c678 Merge "Disallow range selection if the document has unknown page count." into klp-dev 2013-09-26 19:21:06 +00:00
Svetoslav Ganov
c9cfd605a2 Merge "Missed signal in FusedPrintersLoader." into klp-dev 2013-09-26 19:20:28 +00:00
Svetoslav Ganov
027ff3855d Merge "Page range validation edge case handling." into klp-dev 2013-09-26 19:19:39 +00:00
Martijn Coenen
1de64c0aa5 Merge "Fix crash in ApduServiceInfo parsing." into klp-dev 2013-09-26 18:48:20 +00:00
Martijn Coenen
eed43391c6 Fix crash in ApduServiceInfo parsing.
Bug: 10949100
Change-Id: I181734074b071179ea5637a070714643508bc64b
2013-09-26 11:20:37 -07:00