112463 Commits

Author SHA1 Message Date
David Friedman
4feebfc427 am afd85f82: am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs
* commit 'afd85f820e032e12887c820883bf1f7d1df14374':
  Docs: Changed
2013-09-27 15:58:05 -07:00
David Friedman
6f3193f78d am f0a5a844: am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs
* commit 'f0a5a844a94e3eec386b8fb08d7b405e1e95ed6f':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902
2013-09-27 15:58:02 -07:00
David Friedman
4778aff02f am ff379fc4: am 707bac2b: 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 'ff379fc45c70ab92e6b5422646c9aa67a86002e0':
  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 15:57:59 -07:00
David Friedman
d42e4132ba am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '233a341b6d9477f7f41d5a954fa7f7a150972ccb':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 15:57:56 -07:00
David Friedman
3f54532d72 am 657343d7: am b648f950: 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 '657343d782b5ddd8144c724d9131d3f51f39cd8c':
  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 15:57:53 -07:00
Lajos Molnar
974a6e1231 Merge "Make SubtitleController thread safe" into klp-dev 2013-09-27 22:57:22 +00:00
Lajos Molnar
29f5183794 Make SubtitleController thread safe
Add the concept of an anchor looper.
Allow show/hide/selectTrack/selectDefaultTrack to be called from thread
other than anchor looper.

Change-Id: Iaf2f3d3c46d1b00a0a24156745ec16b301c80c04
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10919206
2013-09-27 14:55:36 -07:00
Raph Levien
e048f84a76 Fix for jank when fast-scrolling DeskClock's world cities list in RTL
This is a fix for bug 10863979.

The onPreDraw() method in TextView was canceling the draw every time a
the horizontal scroll changed. These dropped frames were visible as
jank. The fix is to never cancel the draw. It seems likely that the
previous rationale for canceling draw is no longer valid, due to other
fixes, because the scroll state will have been fully updated.

Change-Id: I8c2da5450723f993055a49b1cb57320c08f2a11e
2013-09-27 13:36:24 -07:00
Alan Viverette
015bcd4dd4 Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev 2013-09-27 18:03:47 +00:00
David Friedman
afd85f820e am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs
* commit 'c6d085a5179311ba3d7395360e6e427fa4fb076c':
  Docs: Changed
2013-09-27 10:37:27 -07:00
David Friedman
f0a5a844a9 am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs
* commit '165489da28ff5b77d84095461934e86da8591f85':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902
2013-09-27 10:37:22 -07:00
David Friedman
ff379fc45c am 707bac2b: 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 '707bac2bdc40e3d98957e134331279534adf8e70':
  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:37:12 -07:00
David Friedman
233a341b6d am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 10:37:07 -07:00
David Friedman
657343d782 am b648f950: 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 'b648f9509b17bad806c907ffa5270901a86e6c06':
  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:33:15 -07:00
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
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
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