112685 Commits

Author SHA1 Message Date
Amith Yamasani
797df43849 am 01c2e173: (-s ours) am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '01c2e173d99cf4dd1c91cacb9b461082091cbeb3':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 15:58:08 -07:00
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
Scott Main
584d4f69e2 am 57177492: am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
* commit '571774922ce5ace09c746fdb83cbdce243dad3e4':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
2013-09-27 15:36:28 -07:00
Scott Main
571774922c am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
* commit '4a9999f1ad20830df4aa38d3d3a42d73cb9986f0':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
2013-09-27 15:33:18 -07:00
Scott Main
4a9999f1ad remove Remembering Your Users class from nav.
Separate CL will redirect these pages to the Google Auth doc.

Change-Id: Ib47b8e0fffbe776626b463c1199f435a82e64170
2013-09-27 15:24:35 -07: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
Alan Viverette
1e51cc7e71 Clear accessibility focus from recycled views when needed
BUG: 10913323
Change-Id: I99c20269b4f5e491685f75c2e3bbb36d541a5525
2013-09-27 14:32:20 -07:00
Zhijun He
599be6182e Camera2: remove CameraDevice#getProperties
Also cleanup some unnecessary imports.

Bug: 10360518
Change-Id: Id54aa4c9e3dff2bd354e3ebb83687b000842ea3f
2013-09-27 14:31:41 -07:00
Michael Wright
a977707d6e Add missing constructor parameter to KeyEvent
When in the SyntheticKeyHandler, a missing constructor paramater caused the
wrong contstructor to be called. This would cause the device id, scan code and
flags to be incorrect.

Bug: 10966229
Change-Id: Ib84ef88d28c0da517b376c5493a851cf8fe0a9f7
2013-09-27 14:12:23 -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
Amith Yamasani
01c2e173d9 am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '490399292d2160cf94231df7a9e07e8aa8237489':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:55:34 -07:00
Amith Yamasani
490399292d am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '49eb1d958198b2a88455c340c9d072469d065785':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:51:09 -07:00
Amith Yamasani
49eb1d9581 am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit 'd084cc44eb59407c851399d548256c145eb45342':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:46:29 -07:00
Amith Yamasani
d084cc44eb am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '4f59a9216e76207a7003bfe010076aa78eee629a':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:31:18 -07:00
Amith Yamasani
4f59a9216e am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '12fd0f1644b28b6938a504492397e8ca8d38a1c5':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:25:20 -07:00
Amith Yamasani
12fd0f1644 am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit 'f6a0c11615bd5c2c934527a0b20ba13f958913c4':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:23:08 -07:00
Adam Lesinski
d831e80a2f Add badging of Payment apps
HCE apps that declare themselves as payment apps will receive
that badge when running aapt dump badging.

bug:10899864
Change-Id: I7c095214412465ad7a925285d6167e12de16b600
2013-09-27 11:22:46 -07:00
Amith Yamasani
f6a0c11615 am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '9bf1a1394852ad773d590d1cc60c5e50be8cb1b9':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:20:20 -07:00
Amith Yamasani
9bf1a13948 am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '72c5e376879fb72548ef2a1c8d5b063853d174ee':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:17:57 -07:00
Amith Yamasani
72c5e37687 am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit 'ba1ae3af76466b94efedf06c4efac365fd7b9300':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:14:23 -07:00
Adam Lesinski
b1249b822c Add support for dumping new badging
APKs with AccessibilityServices, PrintServices, and or DeviceAdmin
will have those services dumped when running 'aapt dump badging'.

bug:10899864
Change-Id: I9c1f1f36c397b128dca802510368573a54977459
2013-09-27 11:10:37 -07:00
Amith Yamasani
ba1ae3af76 am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '427864188dfc5dd803b15797379b9dc6673abd16':
  Don't instantiate non-Fragments in Fragment.instantiate
2013-09-27 11:10:36 -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
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