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

6681 Commits

Author SHA1 Message Date
Baligh Uddin
d271d054a9 Merge "Import translations. DO NOT MERGE" 2013-10-22 19:48:09 +00:00
Jim Miller
85d7ecfa4b am 6ed3ce0b: am 253f7295: am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '6ed3ce0b71b8d2c180fc9f610eb13cd35dc8ab5e':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:30:29 -07:00
Jim Miller
6ed3ce0b71 am 253f7295: am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '253f7295c820bf960c0411288495145582a0d3b2':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:27:25 -07:00
Jim Miller
253f7295c8 am 1693f6a5: Prevent having multiple seek runnables in flight. 
* commit '1693f6a5639a1f993bdc1dca9dade5e3eb3c14f2':
  Prevent having multiple seek runnables in flight.
 2013-10-21 17:23:54 -07:00
Jim Miller
1693f6a563 Prevent having multiple seek runnables in flight. 
This fix ensures that only one runnable is running at a time, no matter how
many events come in.  There's probably a better way to do this, but this is a
safe fix.

Fixes bug 11307391

Change-Id: I007c95062b20285571f39603c95fb9174b9a2da3
 2013-10-21 17:17:40 -07:00
Jim Miller
74ec0ca98b am 059d89a1: am 262e5281: am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '059d89a1a447095deaa80a0378f822cb25547c70':
  Workaround for corner case in TransitionManager
 2013-10-21 16:17:59 -07:00
Jim Miller
059d89a1a4 am 262e5281: am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '262e5281d7d678c765ae2500dc05c742946c716b':
  Workaround for corner case in TransitionManager
 2013-10-21 16:14:58 -07:00
Jim Miller
262e5281d7 am 644696f0: Merge "Workaround for corner case in TransitionManager" into klp-dev 
* commit '644696f0a0bee1714868b9e9cf351f1380e68f39':
  Workaround for corner case in TransitionManager
 2013-10-21 16:12:18 -07:00
Jim Miller
ee186de4b2 Workaround for corner case in TransitionManager 
This works around a problem where removing a review with unfinished
transitions results in leaked object references to KeyguardTransportControlView.

The workaround disables transitions until we have a better fix.

Fixes bug 11307391

Change-Id: I1df82f2c6f1cd9f5c9076d4c76cfd4aec3b6806c
 2013-10-21 15:36:54 -07:00
Winson Chung
29ffafb62c am 5b0da90a: am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '5b0da90a68d00724da422b9d5e4b24244c101517':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:23:27 -07:00
Winson Chung
5b0da90a68 am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 
* commit '1bab99c8cebbf23379c2ccad9188da1dce6fef09':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)
 2013-10-21 14:20:57 -07:00
Winson Chung
1bab99c8ce Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev 2013-10-21 21:16:23 +00:00
George Mount
e6702cb0f6 Merge "Add ofArgb to ObjectAnimator and ValueAnimator." 2013-10-21 21:13:08 +00:00
Alan Viverette
f7e6c3cb8a am 5c675074: am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit '5c675074c774c4e260f738b52eca47fe9f3e6ffa':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:57:51 -07:00
Alan Viverette
5c675074c7 am c5aa0ab2: am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit 'c5aa0ab2e8c47f0d16077abec1531998fbc5b415':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:55:51 -07:00
Alan Viverette
c5aa0ab2e8 am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 
* commit 'ba551061482780264ab5bc80381e480128789bb6':
  Don't clip keyguard security container children (e.g. glow pad)
 2013-10-21 13:51:10 -07:00
Alan Viverette
ba55106148 Merge "Don't clip keyguard security container children (e.g. glow pad)" into klp-dev 2013-10-21 20:48:57 +00:00
Baligh Uddin
383813e33f Import translations. DO NOT MERGE 
Change-Id: I5fb89f28b23b715dc5de02a0c507cb5eba9ff7f5
Auto-generated-cl: translation import
 2013-10-21 08:30:11 -07:00
Jim Miller
332eb8f7eb am 51e4f391: am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '51e4f391717deb24ea7b22096df2ddb5535aee00':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:17:47 -07:00
Jim Miller
51e4f39171 am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '495bd54c630691811e051247eec87e097c0bb01c':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:14:07 -07:00
Jim Miller
495bd54c63 am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 
* commit '42b7b6927cd31679691b216d1ba09be31c24206e':
  Revert "Fix dodgy states of keyguard transport controls"
 2013-10-18 18:10:57 -07:00
Jim Miller
42b7b6927c Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev 2013-10-19 01:08:12 +00:00
Jim Miller
4d20ed3f26 Revert "Fix dodgy states of keyguard transport controls" 
This reverts commit bdb5ac7ddbabec0ba947a32937d8b95738d513dc.

Change-Id: Iea8db9a590a2a3b65d941b2918345eb27f690240
 2013-10-19 01:00:16 +00:00
Svetoslav Ganov
e9ffeac138 am 8a51e2f4: am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '8a51e2f48cb24113e8463eb251a097080eb46a7f':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:35:31 -07:00
Svetoslav Ganov
8a51e2f48c am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit 'a53e1f81380c018705dc56ee82ec2db155f23489':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:32:57 -07:00
Svetoslav Ganov
a53e1f8138 am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 
* commit '237575278de8cae5d20ee333fcb2ccceee257d67':
  Hide the print dialog if the printing activity is destroyed.
 2013-10-18 17:29:05 -07:00
Svetoslav Ganov
237575278d Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 2013-10-19 00:26:44 +00:00
Svetoslav
d431ffbe30 am 1fb5ea38: am 0acad1de: am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 
* commit '1fb5ea38533b0a163194441f4f28cd64a5835446':
  Printer list items have wrong width.
 2013-10-18 13:34:07 -07:00
Svetoslav
1fb5ea3853 am 0acad1de: am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 
* commit '0acad1de81799f765863118092caef0b6d306df5':
  Printer list items have wrong width.
 2013-10-18 13:30:28 -07:00
Svetoslav
0acad1de81 am 30d9161b: Merge "Printer list items have wrong width." into klp-dev 
* commit '30d9161b8e84652d9ac504b70adacaf729fdb58b':
  Printer list items have wrong width.
 2013-10-18 13:28:32 -07:00
Svetoslav
30d9161b8e Merge "Printer list items have wrong width." into klp-dev 2013-10-18 20:27:06 +00:00
Svetoslav Ganov
858a1850e2 Hide the print dialog if the printing activity is destroyed. 
1. For an app to print it creates a PrintDocumentAdapter implementation
   which is passed to the print dialog activity. If the activity that
   created the adapter is destroyed then the adapter, which may rely on
   the activity state, may be in an invalid state. For example, an app
   creates an adapter and calls print resuting in the app activity and
   the print dialog activity being stacked. Now the user rotates the
   device which triggers the recreating of the activity stack (assume the
   app does not handle rotation). The recreated print dialog activity
   receives the intent that originally created it with containing the
   adapter that was constructed in the context of the old, now destroyed,
   app activity instance.

   To handle this we are limiting an app to be able to print only from
   and activity and when this activity is destroyed we mark the adapter
   as invalid which will result in hiding the print dialog activity. Note
   that if the app process is killed we already handle this in the print
   dialog activiy by registering a death recipient on the adapter binder.

2. In the PrintManager.PrintDocumentAdapterDelegate some of the state is
   accessed only on the main thread and some from miltiple threads. The
   code was trying to avoid locking for state that is not accessed by
   multiple threads but this is error prone and the benefit does not
   justify the complexity and added fragility. Now grabbing a lock all
   the time.

3. The PrintJobConfigActivity waits for it to bind to the print spooler
   service before instantiating its print controller and editor. However,
   these can be accessed by invoking some of the activity cycle callbacks.
   This change is adding null checks for the case where the activity
   callbacks are called before the binding to the spooler is completed.

bug:11242661

Change-Id: Id906b3170e4f0a0553772dfa62686f06fdca0eaf
 2013-10-18 13:12:06 -07:00
Winson Chung
0e9ce34d1c DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473) 
This occurs when switching users on devices that
don't have a rotation lock quick settings tile.

Change-Id: I738ca15ca754be90cec7eaf3a8eda3e38ed96b33
(cherry picked from commit e8f50a1400d288e6fd7c20ec7947270e204ee57d)
 2013-10-18 09:50:37 -07: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
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
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
0c0f1e2eac Merge "Include external storage devices in DocumentsUI." into klp-dev 2013-10-18 01:46:52 +00: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
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
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
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