111433 Commits

Author SHA1 Message Date
Baligh Uddin
22636af2ee am ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ef8000670e0a61085572eeb8ee9115cecebb73a7':
  Import translations. DO NOT MERGE
2013-08-27 17:49:14 -07:00
Baligh Uddin
ef8000670e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:45:47 +00:00
Baligh Uddin
23ca56fc8d am c513608d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c513608dc1944ec8c6578110e47dc60fc9fda4e1':
  Import translations. DO NOT MERGE
2013-08-27 17:45:45 -07:00
Baligh Uddin
d0ed585368 am 397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '397c7aaf8d9a888727f3d1f54282420ee4f830d3':
  Import translations. DO NOT MERGE
2013-08-27 17:45:42 -07:00
Baligh Uddin
c513608dc1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:42:58 +00:00
Baligh Uddin
397c7aaf8d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:42:36 +00:00
Svetoslav Ganov
39149ff6be am ca09dbc6: Merge "Print APIs update." into klp-dev
* commit 'ca09dbc67b28d5d1d16b7966b855229697c6c549':
  Print APIs update.
2013-08-27 17:10:10 -07:00
Svetoslav Ganov
ca09dbc67b Merge "Print APIs update." into klp-dev 2013-08-28 00:07:09 +00:00
Martijn Coenen
61fdf6d155 am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev
* commit 'bbbc8660cdbfb033291f1911742a942a42c85af0':
  Add NFC reader-mode API.
2013-08-27 16:11:32 -07:00
Martijn Coenen
bbbc8660cd Merge "Add NFC reader-mode API." into klp-dev 2013-08-27 23:08:56 +00:00
Alan Viverette
5c5fbb39ec am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
* commit '3d1b3cb9d9ea206d4244ed369224faf4d859973e':
  Add documentation to onTouchEvent for accessibility
2013-08-27 15:52:50 -07:00
Sreeram Ramachandran
3175f08ecb am d8d4c51e: Merge "Fix channel set option in wifi batch scan command." into klp-dev
* commit 'd8d4c51e3b966b9eaff391f736c716343984e79b':
  Fix channel set option in wifi batch scan command.
2013-08-27 15:49:25 -07:00
Alan Viverette
3d1b3cb9d9 Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 2013-08-27 22:48:03 +00:00
Sreeram Ramachandran
d8d4c51e3b Merge "Fix channel set option in wifi batch scan command." into klp-dev 2013-08-27 22:45:30 +00:00
Sreeram Ramachandran
268f329521 Fix channel set option in wifi batch scan command.
Fix by not including extraneous delimiters, and changing the delimiter from a
space to a comma.

Bug: 10444428
Change-Id: Ia3197045d44a2f959316935ae085575500e65459
2013-08-27 14:49:23 -07:00
Martijn Coenen
c20ed2ff12 Add NFC reader-mode API.
Allows applications to temporarily force the NFC controller
to only do tag discovery. This will allow Android applications
to read and interact with devices that employ HCE.

Bug: 10360259
Change-Id: I709ead9a26f8e6ae8582cc295d82bd896e7c5bba
2013-08-27 14:32:53 -07:00
Craig Mautner
8a778be5dc am 61f0f9ad: Merge "When adding a window evaluate all tasks." into klp-dev
* commit '61f0f9ada51a6718075acfe7fafbb9954f38e980':
  When adding a window evaluate all tasks.
2013-08-27 14:23:07 -07:00
Craig Mautner
8fce994c84 am ac738a25: Merge "Hide stackId from prying eyes." into klp-dev
* commit 'ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3':
  Hide stackId from prying eyes.
2013-08-27 14:23:04 -07:00
Craig Mautner
61f0f9ada5 Merge "When adding a window evaluate all tasks." into klp-dev 2013-08-27 21:20:52 +00:00
Craig Mautner
ac738a25f8 Merge "Hide stackId from prying eyes." into klp-dev 2013-08-27 21:20:30 +00:00
Christopher Tate
4b739259d2 am d381680b: Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev
* commit 'd381680b63a36f8a4f1b07286947f1227d83139d':
  Make sure to actually log when Log.wtf() hiccups
2013-08-27 14:19:29 -07:00
Christopher Tate
d381680b63 Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 2013-08-27 21:15:03 +00:00
Christopher Tate
941adc95e1 Make sure to actually log when Log.wtf() hiccups
Bug 10494724

Change-Id: I687d7df73a8f4594d42955f100d928e98bbd9b30
2013-08-27 14:10:44 -07:00
Sandeep Siddhartha
b926523388 am 572ec4e8: Merge "Temporary disable Hotword on lockscreen" into klp-dev
* commit '572ec4e88c943e0ec717b773406aca43a5eafcb9':
  Temporary disable Hotword on lockscreen
2013-08-27 13:36:05 -07:00
Sandeep Siddhartha
572ec4e88c Merge "Temporary disable Hotword on lockscreen" into klp-dev 2013-08-27 20:31:32 +00:00
Sandeep Siddhartha
c4c330156e Temporary disable Hotword on lockscreen
Change-Id: Icdddcc0308b9f3153172e34a8f4d051c58829653
2013-08-27 13:25:40 -07:00
Craig Mautner
018be3da7b When adding a window evaluate all tasks.
Previously the code was adding a window based only on the tasks on
the stack belonging to the window being added. But if a window from
another stack was on top the window would be added out of order.

In particular when there was a dialog over the launcher app and the
device was rotated, the launcher window was being added over the
dialog. This caused the launcher icons to obscure the dialog and for
the dialog buttons to be untouchable.

Fixes bug 9984067.

Change-Id: I9a57eb641d118f4a90e98af8ca77127ab5364e79
2013-08-27 13:25:17 -07:00
John Spurlock
628bf2c240 am 373bc292: Merge "Fix NPE for devices w/out soft-nav." into klp-dev
* commit '373bc2929260157e5695d29a01c9a19f8d1d5714':
  Fix NPE for devices w/out soft-nav.
2013-08-27 13:18:56 -07:00
John Spurlock
373bc29292 Merge "Fix NPE for devices w/out soft-nav." into klp-dev 2013-08-27 20:16:30 +00:00
John Spurlock
f6b639773c Fix NPE for devices w/out soft-nav.
And fix other places w/out null guards in PhoneStatusBar.

Bug:10507892
Change-Id: I1be1b4c88bedd097530fd44d3506b716957f9c14
2013-08-27 16:12:54 -04:00
Chet Haase
b9a474c29b am f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev
* commit 'f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61':
  Fix NPE when setting new LayoutTransition
2013-08-27 12:51:56 -07:00
Chet Haase
f1c3f28eb9 Merge "Fix NPE when setting new LayoutTransition" into klp-dev 2013-08-27 19:50:43 +00:00
Fabrice Di Meglio
71de13128f am 6d7771b5: Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev
* commit '6d7771b575ec9303515128e98fcb67689414ac6e':
  Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()
2013-08-27 12:28:43 -07:00
Chet Haase
fee6f2b3d3 Fix NPE when setting new LayoutTransition
ViewGroup.setLayoutTransition() has logic to cancel a previously-running
transition and remove the ViewGroup's listener from that transition. However,
it is possible for the transition to be set to null on the ViewGroup on the
cancel() call, making the next call to remove the listener crash with an NPE.

The fix is to use a temporary variable to hold the old reference and
not depend on the class instance variable remaining valid/non-null across
the call to cancel().

Issue #10488932 Hangout NPE in ViewGroup.setLayoutTransition on initiating a new conversation
Issue #10509201 ViewGroup.setLayoutTransition(null) causes crash when being called in LayoutTransition.TransitionListener.endTransition()

Change-Id: I7c181b79e6601024c93a8dc246d32b751f78b216
2013-08-27 12:22:29 -07:00
Fabrice Di Meglio
6d7771b575 Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev 2013-08-27 19:04:13 +00:00
Svetoslav Ganov
aec1417ca9 Print APIs update.
1. Added scale to fit and scale to fill fitting modes.

2. Added APIs for a print app to specify which constraints imposed
   by the print attributes were satsified during a layout so they
   are not handled by the printer again, e.g. if the content is to
   be in landscape the the app generated such content the printer
   should rotate the content again.

3. Added some printer statuses.

4. Added a helper class that generates PDF documents with correct
   size based on the passed in print attributes.

5. Exposed a ctor for PageRange which was hidden by mistake and apps
   could not create page ranges. Added API for changing the printer
   status.

Change-Id: If1334a61d2d931027b98075f653018d456b1b768
2013-08-27 11:56:18 -07:00
Tom O'Neill
3bc13da481 am aeda265c: Merge "Remove or reduce visibility of deprecated methods" into klp-dev
* commit 'aeda265c4dcdd60484f9d1923e3fdcba761112e0':
  Remove or reduce visibility of deprecated methods
2013-08-27 11:28:22 -07:00
Chris Wren
ee4a272876 am d220a830: Merge "Change DBG to false to eliminate logcat messages." into klp-dev
* commit 'd220a830f4fb0e13e31d7632eb04f70fedd31e97':
  Change DBG to false to eliminate logcat messages.
2013-08-27 11:24:54 -07:00
Tom O'Neill
aeda265c4d Merge "Remove or reduce visibility of deprecated methods" into klp-dev 2013-08-27 18:23:18 +00:00
Chris Wren
d220a830f4 Merge "Change DBG to false to eliminate logcat messages." into klp-dev 2013-08-27 18:20:44 +00:00
Svetoslav Ganov
c97ab7ea99 am 6b8c69ed: Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev
* commit '6b8c69edd210ad86eb659e06681422bb29ba2123':
  Update AccessibilityNodeInfo API as per API council request
2013-08-27 11:16:04 -07:00
Svetoslav Ganov
6b8c69edd2 Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev 2013-08-27 18:14:01 +00:00
Chris Craik
cd39d8d92e am ece3c9a0: am 3c0624aa: Merge "Forward compatibility fix"
* commit 'ece3c9a0a00849f7396635ec1ded7be58d899b30':
  Forward compatibility fix
2013-08-27 11:11:55 -07:00
Chris Craik
ece3c9a0a0 am 3c0624aa: Merge "Forward compatibility fix"
* commit '3c0624aa1ae9c7d147a3b0f3ea8c05fc4bc4187a':
  Forward compatibility fix
2013-08-27 11:09:33 -07:00
Chris Craik
3c0624aa1a Merge "Forward compatibility fix" 2013-08-27 18:07:49 +00:00
Chris Craik
28fe1ee579 Forward compatibility fix
Change-Id: Ib031372d43881a9bb7af1e51fb2c7cf55e03a326
2013-08-27 10:55:44 -07:00
Tom O'Neill
7f6f45723a Remove or reduce visibility of deprecated methods
- Fix additional getInt() path, restores the location settings screen
functionality.

- Should fix "unresolved link" build breakages in
git_klp-dev-plus-aosp-without-vendor, which is much more persnickety than
klp-dev for some reason.

- Add warning that we may add additional location modes in the future.

- Finish fix for b/10461763 and b/10461474

Change-Id: Id7155e3a0d7526a377d446018ef3bdb057bad3a6
2013-08-27 10:53:15 -07:00
John Spurlock
dda549cb51 am 107e2d41: Merge "Allow wallpaper to extend into the entire screen." into klp-dev
* commit '107e2d418b335263da01aaa9bafb69475e79d7f7':
  Allow wallpaper to extend into the entire screen.
2013-08-27 10:22:44 -07:00
John Spurlock
107e2d418b Merge "Allow wallpaper to extend into the entire screen." into klp-dev 2013-08-27 17:19:35 +00:00
Victoria Lease
c27bc4fbb2 am adae1e91: am 1b8c33c6: Merge "Forward compatibility fixes"
* commit 'adae1e91de4b2be7a67a33e8f3c3161f5cec15e1':
  Forward compatibility fixes
2013-08-27 09:57:26 -07:00