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

118189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
29cf698d1a Merge "Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView" into klp-dev 2013-10-18 02:07:24 +00:00
Jeff Brown
f10ba7c7dc Merge "Make dump messages asynchronous." into klp-dev 2013-10-18 02:07:18 +00:00
Jeff Sharkey
eeb58c79c0 am 703840da: am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '703840da8a33c703f2d787526438c650b0318845':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:55:22 -07:00
Jeff Sharkey
db289e0ac7 am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
  Plumb through physical device UUID and label.
 2013-10-17 18:55:13 -07:00
Jeff Sharkey
703840da8a am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '1a5804d7aa253432f37fbd5d8eb89ac363501fe9':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:53:26 -07:00
Jeff Sharkey
47938450b4 am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
  Plumb through physical device UUID and label.
 2013-10-17 18:53:15 -07:00
Jeff Sharkey
1a5804d7aa am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev 
* commit '0c0f1e2eac76a3b65349d4d5d6cc8c63a393f025':
  Include external storage devices in DocumentsUI.
 2013-10-17 18:50:34 -07:00
Jeff Sharkey
306bb90d97 am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev 
* commit '8f4c15d8e48c25d8f626afef7c9f5cb2c7747e0c':
  Plumb through physical device UUID and label.
 2013-10-17 18:50:30 -07:00
Jeff Sharkey
0c0f1e2eac Merge "Include external storage devices in DocumentsUI." into klp-dev 2013-10-18 01:46:52 +00:00
Jeff Sharkey
8f4c15d8e4 Merge "Plumb through physical device UUID and label." into klp-dev 2013-10-18 01:45:58 +00:00
Dianne Hackborn
e05df630bc am 9039b9a7: am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 
* commit '9039b9a7efd6d42e842de35d2246971e74753035':
  Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
 2013-10-17 18:32:22 -07:00
Dianne Hackborn
9039b9a7ef am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 
* commit '63a16e0e0c4a9691a35f815d5422bdf0fa72efda':
  Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
 2013-10-17 18:29:17 -07:00
Dianne Hackborn
63a16e0e0c am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 
* commit '6834ae6922625d2001eeb4f73f7fcd0df3a71f3c':
  Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
 2013-10-17 18:27:25 -07:00
Dianne Hackborn
6834ae6922 Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev 2013-10-18 01:25:00 +00:00
Dianne Hackborn
09acb7ca89 Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞... 
Well, how about 400.  400 is a real number.

Change-Id: I29ac61b7d629d582c7b68367365a7f81fcf679a2
 2013-10-17 17:28:09 -07:00
Jim Miller
e400a2900d am 53caf875: am 01491271: am 53cb242f: Merge "Fix issue where keyguard adds widgets before the system is ready" into klp-dev 
* commit '53caf87531372048d4171626e767eeeb94ec664c':
  Fix issue where keyguard adds widgets before the system is ready
 2013-10-17 16:27:02 -07:00
Jim Miller
53caf87531 am 01491271: am 53cb242f: Merge "Fix issue where keyguard adds widgets before the system is ready" into klp-dev 
* commit '0149127198f9fc46a3a4f0b7f4e9579b72273b46':
  Fix issue where keyguard adds widgets before the system is ready
 2013-10-17 16:23:13 -07:00
Jim Miller
0149127198 am 53cb242f: Merge "Fix issue where keyguard adds widgets before the system is ready" into klp-dev 
* commit '53cb242f39c9ccfee3381ff28625e74e365d29b7':
  Fix issue where keyguard adds widgets before the system is ready
 2013-10-17 16:19:31 -07:00
Jim Miller
53cb242f39 Merge "Fix issue where keyguard adds widgets before the system is ready" into klp-dev 2013-10-17 23:17:19 +00:00
Robert Greenwalt
e6c5544c07 am fe10a506: am 20c811dd: am b1f0bba1: Merge "Change how we use provisioning url so post works" into klp-dev 
* commit 'fe10a506fd569a153275d9106f97a859203439c7':
  Change how we use provisioning url so post works
 2013-10-17 16:13:24 -07:00
Scott Main
2e8e2000d7 am 94dc050f: am 12e067fd: am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback 
* commit '94dc050fb97d5c36c1a6c7e59f5ef6c9e7055b3c':
  additional javadoc for NfcAdapter.ReaderCallback
 2013-10-17 16:13:20 -07:00
Robert Greenwalt
fe10a506fd am 20c811dd: am b1f0bba1: Merge "Change how we use provisioning url so post works" into klp-dev 
* commit '20c811dd3b2191aa213337cf06ab5b34f85ee7fe':
  Change how we use provisioning url so post works
 2013-10-17 16:09:32 -07:00
Scott Main
94dc050fb9 am 12e067fd: am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback 
* commit '12e067fd38d513e3c6ad3704ada0286347d72b65':
  additional javadoc for NfcAdapter.ReaderCallback
 2013-10-17 16:09:27 -07:00
Robert Greenwalt
20c811dd3b am b1f0bba1: Merge "Change how we use provisioning url so post works" into klp-dev 
* commit 'b1f0bba1bd516d7136f585c69e6802b65315db0b':
  Change how we use provisioning url so post works
 2013-10-17 16:03:48 -07:00
Scott Main
12e067fd38 am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback 
* commit 'b38ad76a829f9bdbc27e86647de31a5ad19f117a':
  additional javadoc for NfcAdapter.ReaderCallback
 2013-10-17 16:03:45 -07:00
Robert Greenwalt
b1f0bba1bd Merge "Change how we use provisioning url so post works" into klp-dev 2013-10-17 23:00:42 +00:00
Alan Viverette
4732783143 am 20fbf7ea: am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev 
* commit '20fbf7ea91c321e6e8974cc1750b86c6c456ab3c':
  Fix assorted FastScroller regressions
 2013-10-17 14:40:28 -07:00
Chris Craik
a25f4d838c Merge "Clean unused parameters, disable warnings" 2013-10-17 20:44:02 +00:00
Robert Greenwalt
536b3c2b6c Change how we use provisioning url so post works 
Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser.  The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549
 2013-10-17 12:46:52 -07:00
Scott Main
b38ad76a82 additional javadoc for NfcAdapter.ReaderCallback 
Change-Id: I3cad8b43d53992bb3d53920abb510456ee72afb5
 2013-10-17 11:57:06 -07:00
Alan Viverette
20fbf7ea91 am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev 
* commit 'a74cf4f962bbd8ae421b56d875f931806afa13ea':
  Fix assorted FastScroller regressions
 2013-10-17 11:36:46 -07:00
Alan Viverette
a74cf4f962 am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev 
* commit '280dc0ea2f1071809d7619918c33091e13d1f25a':
  Fix assorted FastScroller regressions
 2013-10-17 11:33:24 -07:00
Alan Viverette
280dc0ea2f Merge "Fix assorted FastScroller regressions" into klp-dev 2013-10-17 18:30:25 +00:00
Deepanshu Gupta
272d1bce79 Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView 
Change-Id: Ica79267a4eb231db833cb0232cfacf419fe73de3
 2013-10-17 11:28:48 -07:00
Svetoslav Ganov
da5132c2b0 am 6f570bd8: am a225bbdd: am 54e55759: Merge "All printers list has incorrect padding and item height." into klp-dev 
* commit '6f570bd8c08df3eac750b7b0d7dae470bb23673d':
  All printers list has incorrect padding and item height.
 2013-10-17 11:18:22 -07:00
Svetoslav Ganov
6f570bd8c0 am a225bbdd: am 54e55759: Merge "All printers list has incorrect padding and item height." into klp-dev 
* commit 'a225bbddeccff76b92f18e620df0a8b773d4befd':
  All printers list has incorrect padding and item height.
 2013-10-17 11:14:56 -07:00
Svetoslav Ganov
a225bbddec am 54e55759: Merge "All printers list has incorrect padding and item height." into klp-dev 
* commit '54e5575924d3abba8129268d2d0553efc9a841eb':
  All printers list has incorrect padding and item height.
 2013-10-17 11:11:35 -07:00
Svetoslav Ganov
54e5575924 Merge "All printers list has incorrect padding and item height." into klp-dev 2013-10-17 18:06:55 +00:00
Jeff Sharkey
1f706c6cd1 Include external storage devices in DocumentsUI. 
Include volume UUID in generated document IDs to uniquely identify
volumes over time.  Show volume label to users.  Watch for mount
changes to update available roots.

Bug: 11175082
Change-Id: Ia151bde768587468efde0c1d97a740b5353d1582
 2013-10-17 10:55:32 -07:00
Adam Powell
d21b70322a am 16f495df: am 11c746ab: am a9412556: Merge "Fix stale data in keyguard transport control display" into klp-dev 
* commit '16f495dfa43a9e51e3964511c9d6e5567528587d':
  Fix stale data in keyguard transport control display
 2013-10-17 10:41:19 -07:00
Chris Craik
e63f7c622a Clean unused parameters, disable warnings 
Change-Id: Iddb872f53075dd022eeef45265594d1c6a9e2bc0
 2013-10-17 10:37:15 -07:00
Adam Powell
16f495dfa4 am 11c746ab: am a9412556: Merge "Fix stale data in keyguard transport control display" into klp-dev 
* commit '11c746abf3793cf122a353dbee1d73e2eddbfb82':
  Fix stale data in keyguard transport control display
 2013-10-17 10:35:17 -07:00
Adam Powell
eb66b5d4cd am 406e9a01: am 708bc0e2: am f80a7af0: Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev 
* commit '406e9a01c35e4a22e1f15b9f4ce1c4ce329f78a2':
  Register receivers from ViewFlipper with an explicit Handler
 2013-10-17 10:34:26 -07:00
Svetoslav Ganov
ed513d7e4a All printers list has incorrect padding and item height. 
1. We were using the layout for the printer drop down from the
   print dialog as the list item in the all printers activity.
   This layout was not high enough. Now we have a separate
   layout for the drop down and for the list. Note that they
   are almost identical but this is better that writing java
   code to lookup the height from the theme and change it
   programatically since the java code is almost half the size
   of the layout and leads to spreading the logic in both the
   layout file and the java code.

2. The padding of the printers list was not correct. Now it
   mimics the bahavior in settings where we change the padding
   based on orientation.

bug:11261157

Change-Id: I8507c4ee86e9196fe1777cf9577f1886ccfbb1ad
 2013-10-17 10:33:14 -07:00
Adam Powell
11c746abf3 am a9412556: Merge "Fix stale data in keyguard transport control display" into klp-dev 
* commit 'a9412556d213e07b248ef7e924f0e4cee183efc5':
  Fix stale data in keyguard transport control display
 2013-10-17 10:32:19 -07:00
Adam Powell
406e9a01c3 am 708bc0e2: am f80a7af0: Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev 
* commit '708bc0e24e503beb3b4e31eda8705357c77efcd8':
  Register receivers from ViewFlipper with an explicit Handler
 2013-10-17 10:31:47 -07:00
Adam Powell
a9412556d2 Merge "Fix stale data in keyguard transport control display" into klp-dev 2013-10-17 17:29:52 +00:00
Adam Powell
708bc0e24e am f80a7af0: Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev 
* commit 'f80a7af0febcf09b47eb7122c6ad4cff6c4330fc':
  Register receivers from ViewFlipper with an explicit Handler
 2013-10-17 10:28:48 -07:00
Adam Powell
f80a7af0fe Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev 2013-10-17 17:26:10 +00:00
John Spurlock
d25134b959 am 664c29d3: am dd9e681c: am b346270d: Merge "Input method root view should have BOTTOM gravity." into klp-dev 
* commit '664c29d391046e29d83f1ef0bfc8501f2bd84d42':
  Input method root view should have BOTTOM gravity.
 2013-10-17 09:43:28 -07:00