112602 Commits

Author SHA1 Message Date
David Friedman
c6d085a517 am 37453a83: Merge "Docs: Changed" into jb-mr2-docs
* commit '37453a8353a190233c94c9f40261feef6a9ebf08':
  Docs: Changed
2013-09-27 10:30:09 -07:00
David Friedman
165489da28 am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs
* commit '2fe85a10abcb216dded99792466124f7f80574f2':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902
2013-09-27 10:30:06 -07:00
David Friedman
707bac2bdc am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs
* commit '0b1cfc1fb64a1b24f107abf106eb839287f65cfb':
  Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360
2013-09-27 10:30:03 -07:00
David Friedman
1b8e319784 am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '8c38ea39203016dde95bc5dd68f27f6f45096784':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 10:30:01 -07:00
Amith Yamasani
427864188d Don't instantiate non-Fragments in Fragment.instantiate
Backport...

Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug: 9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d
2013-09-27 10:28:09 -07:00
David Friedman
b648f9509b am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
* commit '23bd5927f1c82f3f63288fbee4e7c460fca3dc4e':
  Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
2013-09-27 10:26:23 -07:00
David Friedman
37453a8353 Merge "Docs: Changed" into jb-mr2-docs 2013-09-27 17:25:42 +00:00
David Friedman
2fe85a10ab Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs 2013-09-27 17:25:29 +00:00
David Friedman
0b1cfc1fb6 Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs 2013-09-27 17:25:16 +00:00
David Friedman
8c38ea3920 Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs 2013-09-27 17:24:41 +00:00
David Friedman
36b692d8ef Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.
Bug: 10807931 10796994

Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c
2013-09-27 10:04:48 -07:00
Svetoslav Ganov
6be4c76441 Adding a timeout for waiting to get the selected printer's capabilities.
A print service may choose to provide only the printer info and then when
it is requested to start tracking the state of the printer, the service
should provide the printer capabilities. If the capabilities are not
received within ten seconds we mark the printer as unavailable and stop
tracking it.

bug:10748639

Change-Id: I9171cb5dc116fd321c23a8e4ab55109448e2fc6a
2013-09-27 09:43:32 -07:00
Daniel Sandler
723ad75e10 Merge "API cleanups for Notification." into klp-dev 2013-09-27 16:08:45 +00:00
Daniel Sandler
cf1d39b178 API cleanups for Notification.
- Calling build() on a Style now goes through the same
  codepath as calling build() on the Builder.
- Documented new constants and unhidden classes.
- Fixed crash in Action.clone().

Bug: 10112103
Bug: 10461196
Change-Id: I08cd94790b538a361ccf8ff3682f6a86a7812b95
2013-09-27 11:58:58 -04:00
John Spurlock
d01a1b0473 Merge "Remove unused views when we return to keyguard" into klp-dev 2013-09-27 14:32:38 +00:00
John Spurlock
e5b14ee128 Merge "Restore scrim views to former place in view hierarchy." into klp-dev 2013-09-27 14:27:38 +00:00
John Spurlock
256ae67b9a Restore scrim views to former place in view hierarchy.
By enabling KeyguardHostView to extend into the full screen area
and updating custom measure/layout in the Challenge layouts
appropriately.

Bug:10939005
Change-Id: I06fb187c4100cf0f2e48b1206cc4450afa4567dd
2013-09-27 10:19:12 -04:00
David Friedman
23bd5927f1 Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed.
Bug: 10796099

Change-Id: Ideb1dbf70b9034e88683ef19ec1a3d338b7ea06b
2013-09-26 22:30:11 -07:00
Jean Chalard
5638d29a64 Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev 2013-09-27 03:11:42 +00:00
Daniel Sandler
a9cf1de470 Merge "Would you like a dessert?" into klp-dev 2013-09-27 03:10:38 +00:00
Jeff Sharkey
10d655927c Merge "Make directories always enabled, for realz." into klp-dev 2013-09-27 02:55:05 +00:00
Jeff Sharkey
3d52dc9c3a Make directories always enabled, for realz.
Bug: 10946731
Change-Id: I3eb132c53e47f31d1d1723ed2262823b54b1fce0
2013-09-26 19:42:52 -07:00
Svetoslav
25b0151a57 Merge "Printers in the list of printers change position." into klp-dev 2013-09-27 02:24:38 +00:00
Svetoslav
c335eb4115 Printers in the list of printers change position.
1. The printers in the printers list of settings change position if
   they are updated. The settings app is using hidden platform APIs
   the this change fixes.

2. Enable ProGuard for the PrintSpooler.

3. Added icons on the list of printers so the user knows which
   print service used the printer. Now the user can know when
   he is using cloud print and maybe incurring data costs vs
   local printer discovered by a vendor plug in.

bug:10955751

Change-Id: I292f48b424cb561218fdb424d0388f4d786d8339
2013-09-26 18:49:10 -07:00
Craig Mautner
231bd6c514 Merge "Dismiss keyguard when resuming visible activities" into klp-dev 2013-09-27 00:46:53 +00:00
Adam Powell
8fb6d97ad5 Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev 2013-09-27 00:46:10 +00:00
Craig Mautner
0756632aa0 Dismiss keyguard when resuming visible activities
If an activity is visible behind the keyguard when it is launched
by another activity then there would be no call to dismissKeyguard.
Because the other activity is pausing the call to dismissKeyguard
is skipped in startActivityLocked(). And because it is already
visible the call to ActivityRecord.windowsVisible() is never made and
the call to reportActivityVisibleLocked() which calls
dismissKeyguard() is also never made.

This change recognizes when an activity is resumed and visible and
calls dismissKeyguard() in that case.

Fixes bug 10732489.

Change-Id: I3de1350a55231aaa14dadc8709fd0fcf4960742c
2013-09-26 17:41:05 -07:00
Chet Haase
033837dd6b Merge "Make fading transitions work better" into klp-dev 2013-09-27 00:26:22 +00:00
David Friedman
8ca6a095a3 Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null.
Bug: 10797360

Change-Id: I95344c2200cad5efb6457a9cb8fcd0e87298dcda
2013-09-26 17:19:43 -07:00
Raph Levien
adf149029f Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev 2013-09-26 23:31:49 +00:00
Scott Main
aaf0f83c69 am ef4e5e61: am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit 'ef4e5e6182e020d0dd349848b38a33e0c33491b4':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-26 16:25:24 -07:00
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