drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,041 Commits 1 Branch 0 Tags
Commit Graph

112041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santos Cordon
04dfb5ec3c Protecting against NPE with null country detector. 
bug:10514454
Change-Id: I316c47eddbe4929599866a3f9da9129d0056e3e2
 2013-08-27 16:45:37 -07:00
Martijn Coenen
ef97ba1958 am 61fdf6d1: am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev 
* commit '61fdf6d155a4fad1d27a7593618d29f638ea9f6a':
  Add NFC reader-mode API.
 2013-08-27 16:14:59 -07: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
Zhijun He
e2a11bb74d ImageReader: Fix null listener case 
Only do the handler check when listener is not null.

Bug: 10360518
Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
 2013-08-27 16:02:21 -07:00
Alan Viverette
9d345ff4cb am 5c5fbb39: am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 
* commit '5c5fbb39ec7c2ee51ad2b74c9c4604bb575bb6f7':
  Add documentation to onTouchEvent for accessibility
 2013-08-27 15:55:58 -07: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
659b7179d4 am 3175f08e: am d8d4c51e: Merge "Fix channel set option in wifi batch scan command." into klp-dev 
* commit '3175f08ecb2e981504a0917f8c0ec469e0fe4074':
  Fix channel set option in wifi batch scan command.
 2013-08-27 15:52:31 -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
Alan Viverette
1955a5b531 Add public API for obtaining drag-to-open listener 
BUG: 10457019
Change-Id: I66485521c54b82033044834e7aab6707a3049e6b
 2013-08-27 15:45:16 -07:00
Jeff Hao
78da49f4bc Merge MPSE and SPSE Chunk handlers for ddms. 
Change-Id: Ic25d31ee16f65a638ecb8957636ebfdb9beb4eb7
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
 2013-08-27 22:37:58 +00:00
Jeff Hao
55de3f5442 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-27 22:17:40 +00:00
John Spurlock
4bf5c0e242 Remove unreferenced assets from SystemUI. 
Bug:10502089
Change-Id: I9c414ff88054a764ab56f70ae8a0c0c82c248be9
 2013-08-27 17:53:08 -04: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
1a77a41459 am 8a778be5: am 61f0f9ad: Merge "When adding a window evaluate all tasks." into klp-dev 
* commit '8a778be5dc2f441124d438c5e75a635a889b6df0':
  When adding a window evaluate all tasks.
 2013-08-27 14:27:32 -07:00
Craig Mautner
c5dd502056 am 8fce994c: am ac738a25: Merge "Hide stackId from prying eyes." into klp-dev 
* commit '8fce994c8472a29197aa4c5dae070c7be518ad3f':
  Hide stackId from prying eyes.
 2013-08-27 14:27:29 -07:00
Christopher Tate
eb2177b2ba am 4b739259: am d381680b: Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 
* commit '4b739259d2a451df9bd317b1ce2d1c0169ab9e6e':
  Make sure to actually log when Log.wtf() hiccups
 2013-08-27 14:24:00 -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
Jeff Hao
e3d54fe23a Add frameworks support for sample profiling from traceview gui. 
Change-Id: I702f12cdd8bd27b762f30e158fbe824909421dee
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
 2013-08-27 20:53:09 +00:00
Sandeep Siddhartha
10271233cb am b9265233: am 572ec4e8: Merge "Temporary disable Hotword on lockscreen" into klp-dev 
* commit 'b9265233882d6c026918f985e7448d25d42d5960':
  Temporary disable Hotword on lockscreen
 2013-08-27 13:38:52 -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
John Spurlock
d199e5e604 am 628bf2c2: am 373bc292: Merge "Fix NPE for devices w/out soft-nav." into klp-dev 
* commit '628bf2c24039cf03915d581c69c7cf4e90085e45':
  Fix NPE for devices w/out soft-nav.
 2013-08-27 13:28:11 -07:00
Chet Haase
f87fa1b5a8 am b9a474c2: am f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev 
* commit 'b9a474c29bfb2cc69710b0716f756cfea9e64c00':
  Fix NPE when setting new LayoutTransition
 2013-08-27 13:28:02 -07: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
Fabrice Di Meglio
e94aceabdb resolved conflicts for merge of 71de1312 to master 
Change-Id: Ib2065147a3160b5176fd44a4d14bec06c7c973e1
 2013-08-27 12:56:20 -07: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
John Spurlock
e47193d8e1 Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE. 
And add more colour to the docs.

Bug:10460791
Change-Id: I703d927101bb034ba6dd061e6afd3e1946440fe5
 2013-08-27 14:53:21 -04:00
Tom O'Neill
a6fd96c420 am 3bc13da4: am aeda265c: Merge "Remove or reduce visibility of deprecated methods" into klp-dev 
* commit '3bc13da4814fa3020ada4707aee94156af0410fc':
  Remove or reduce visibility of deprecated methods
 2013-08-27 11:31:16 -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
b07d769524 am ee4a2728: am d220a830: Merge "Change DBG to false to eliminate logcat messages." into klp-dev 
* commit 'ee4a272876619da6518a39dc41ed8505a6265110':
  Change DBG to false to eliminate logcat messages.
 2013-08-27 11:27:49 -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