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

91279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
713246ba21 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-08 06:59:19 -07:00
Amith Yamasani
1a8d0f7a94 am 45e3c4f0: am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev 
* commit '45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741':
  Fix resource reading for secondary users
 2012-10-07 23:44:35 -07:00
Daniel Sandler
e45155297e am 5fd8cd3e: am bb1c1d36: am de8e3b12: Merge "Fix NPE if pulling down QS quickly on very first boot." into jb-mr1-dev 
* commit '5fd8cd3e1981ae248ad609a17f88df4b4fd4a159':
  Fix NPE if pulling down QS quickly on very first boot.
 2012-10-07 23:44:31 -07:00
Daniel Sandler
47c9118fb5 am 7dc4c4be: am 60e8ff6d: am 33a8bd8c: Merge "New icon for "Sleep now."" into jb-mr1-dev 
* commit '7dc4c4be1601f5e201761e34e9db440dda7ebd6d':
  New icon for "Sleep now."
 2012-10-07 23:44:27 -07:00
Eric Laurent
9fd5ea1ad6 am c2980b03: am 8c362b02: am 843c5395: Merge "AudioService: fix settings for fixed volume device" into jb-mr1-dev 
* commit 'c2980b0355ffdeeab9a0aacdc2e24c20961d883e':
  AudioService: fix settings for fixed volume device
 2012-10-07 23:44:23 -07:00
Romain Guy
acf74db4ac am bfb2883b: am b0f85147: am 133fcdf4: Merge "Clear draw flags when updating TextureView\'s layer Bug #7171323" into jb-mr1-dev 
* commit 'bfb2883b57a0eabb83d786a1f9d187a26e36d7f5':
  Clear draw flags when updating TextureView's layer Bug #7171323
 2012-10-07 23:44:19 -07:00
Daniel Sandler
34a24c3f0b am 7ca4861f: am 969e8d52: am 118f4844: Fix NPE on devices without notification panel help clings. 
* commit '7ca4861f144f99ad8b9ba91dd48cdf2d189a2341':
  Fix NPE on devices without notification panel help clings.
 2012-10-07 23:44:16 -07:00
Adam Powell
48a9d69313 am a4400148: am 521b011c: am b3419595: Merge "QuickSettings - fail gracefully if we can\'t query the profile data" into jb-mr1-dev 
* commit 'a440014836a2cdd306f6f6748f71c922f45e0b20':
  QuickSettings - fail gracefully if we can't query the profile data
 2012-10-07 23:44:12 -07:00
Romain Guy
ae8046f22e am 466c58d4: am f3c2eb79: am d6344d76: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev 
* commit '466c58d4e179d3d04e5b3785090c298a1bad79b3':
  Work around a possible driver bug Bug #7296475
 2012-10-07 23:44:07 -07:00
Dianne Hackborn
f1817f9754 am c283140f: am edc3f3f3: am b52b6bf1: Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev 
* commit 'c283140f63c0bbe7b102177f076db0a42ebfc7b9':
  Fix issue #7295951: Mako asks which Launcher to use at every re-boot
 2012-10-07 23:44:03 -07:00
Jeff Brown
08e255c9b8 am f9205adb: am 3a8effb8: am 9302251e: Merge "Reduce screen on latency, eliminate flashes." into jb-mr1-dev 
* commit 'f9205adb415cf87a9c4956e0b850c831801cc1f3':
  Reduce screen on latency, eliminate flashes.
 2012-10-07 23:43:59 -07:00
Dianne Hackborn
8c8487fde2 am 47e23ecb: am e71a630f: am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev 
* commit '47e23ecb4cf3754c3e458371313b28d1fb043cdf':
  More on #7296510 Transition from lock screen to dreaming is really bad
 2012-10-07 23:43:55 -07:00
Amith Yamasani
45e3c4f0c7 am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev 
* commit '1409c99f8b64adcedf30b8709a22dbb257710f94':
  Fix resource reading for secondary users
 2012-10-07 23:41:13 -07:00
Daniel Sandler
5fd8cd3e19 am bb1c1d36: am de8e3b12: Merge "Fix NPE if pulling down QS quickly on very first boot." into jb-mr1-dev 
* commit 'bb1c1d3628cde147b6ee5f68a474def9434a7e72':
  Fix NPE if pulling down QS quickly on very first boot.
 2012-10-07 23:41:10 -07:00
Daniel Sandler
7dc4c4be16 am 60e8ff6d: am 33a8bd8c: Merge "New icon for "Sleep now."" into jb-mr1-dev 
* commit '60e8ff6df5b89ef2559ddf64fd5b68e71ba5b710':
  New icon for "Sleep now."
 2012-10-07 23:41:06 -07:00
Eric Laurent
c2980b0355 am 8c362b02: am 843c5395: Merge "AudioService: fix settings for fixed volume device" into jb-mr1-dev 
* commit '8c362b02cfe701c779f315b6a0a208ebd519dcb0':
  AudioService: fix settings for fixed volume device
 2012-10-07 23:41:03 -07:00
Romain Guy
bfb2883b57 am b0f85147: am 133fcdf4: Merge "Clear draw flags when updating TextureView\'s layer Bug #7171323" into jb-mr1-dev 
* commit 'b0f85147539f0ee2b165c07534a540deccfcd348':
  Clear draw flags when updating TextureView's layer Bug #7171323
 2012-10-07 23:40:59 -07:00
Daniel Sandler
7ca4861f14 am 969e8d52: am 118f4844: Fix NPE on devices without notification panel help clings. 
* commit '969e8d52faa32a6602a7fd0a851e7e56d9abeff0':
  Fix NPE on devices without notification panel help clings.
 2012-10-07 23:40:55 -07:00
Adam Powell
a440014836 am 521b011c: am b3419595: Merge "QuickSettings - fail gracefully if we can\'t query the profile data" into jb-mr1-dev 
* commit '521b011c84eec82db8edf0fe466932cb04c957cc':
  QuickSettings - fail gracefully if we can't query the profile data
 2012-10-07 23:40:52 -07:00
Romain Guy
466c58d4e1 am f3c2eb79: am d6344d76: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev 
* commit 'f3c2eb79e4660692d85cc531c2825bff65270242':
  Work around a possible driver bug Bug #7296475
 2012-10-07 23:40:48 -07:00
Dianne Hackborn
c283140f63 am edc3f3f3: am b52b6bf1: Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev 
* commit 'edc3f3f3415ebfb59f4bfb1143fca85aa65e1fca':
  Fix issue #7295951: Mako asks which Launcher to use at every re-boot
 2012-10-07 23:40:45 -07:00
Jeff Brown
f9205adb41 am 3a8effb8: am 9302251e: Merge "Reduce screen on latency, eliminate flashes." into jb-mr1-dev 
* commit '3a8effb8aed604a756682fa65c09f882b65cf97a':
  Reduce screen on latency, eliminate flashes.
 2012-10-07 23:40:41 -07:00
Dianne Hackborn
47e23ecb4c am e71a630f: am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev 
* commit 'e71a630fc6f9e0c19490a2645ad9ff0c315c4e95':
  More on #7296510 Transition from lock screen to dreaming is really bad
 2012-10-07 23:40:38 -07:00
Amith Yamasani
1409c99f8b am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev 
* commit '9c2a38ed10592a54d9bb753ef882632f7a8cd446':
  Fix resource reading for secondary users
 2012-10-07 23:36:22 -07:00
Daniel Sandler
bb1c1d3628 am de8e3b12: Merge "Fix NPE if pulling down QS quickly on very first boot." into jb-mr1-dev 
* commit 'de8e3b122bbbd61aa35fd5cd4fe2fc86cd6f0040':
  Fix NPE if pulling down QS quickly on very first boot.
 2012-10-07 23:36:19 -07:00
Daniel Sandler
60e8ff6df5 am 33a8bd8c: Merge "New icon for "Sleep now."" into jb-mr1-dev 
* commit '33a8bd8c40ac3c19674043b1cf3e232a3220868f':
  New icon for "Sleep now."
 2012-10-07 23:36:15 -07:00
Eric Laurent
8c362b02cf am 843c5395: Merge "AudioService: fix settings for fixed volume device" into jb-mr1-dev 
* commit '843c539514302350ee2fcbfcc0a689a41edca25d':
  AudioService: fix settings for fixed volume device
 2012-10-07 23:36:12 -07:00
Romain Guy
b0f8514753 am 133fcdf4: Merge "Clear draw flags when updating TextureView\'s layer Bug #7171323" into jb-mr1-dev 
* commit '133fcdf44bccbda1fe7931bca7d911806435491b':
  Clear draw flags when updating TextureView's layer Bug #7171323
 2012-10-07 23:36:08 -07:00
Daniel Sandler
969e8d52fa am 118f4844: Fix NPE on devices without notification panel help clings. 
* commit '118f484424f3e5649833df42a7e613f41b2b2ecd':
  Fix NPE on devices without notification panel help clings.
 2012-10-07 23:36:05 -07:00
Adam Powell
521b011c84 am b3419595: Merge "QuickSettings - fail gracefully if we can\'t query the profile data" into jb-mr1-dev 
* commit 'b3419595c78401c51966f3b104c25eef155ed9a2':
  QuickSettings - fail gracefully if we can't query the profile data
 2012-10-07 23:36:02 -07:00
Romain Guy
f3c2eb79e4 am d6344d76: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev 
* commit 'd6344d76594c49b3e4e5fc062d933f021742c847':
  Work around a possible driver bug Bug #7296475
 2012-10-07 23:35:58 -07:00
Dianne Hackborn
edc3f3f341 am b52b6bf1: Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev 
* commit 'b52b6bf138c9aa5e986c8be95fcd23448792a078':
  Fix issue #7295951: Mako asks which Launcher to use at every re-boot
 2012-10-07 23:35:54 -07:00
Jeff Brown
3a8effb8ae am 9302251e: Merge "Reduce screen on latency, eliminate flashes." into jb-mr1-dev 
* commit '9302251e3a09810164895237a6a2e8ac4987c3c0':
  Reduce screen on latency, eliminate flashes.
 2012-10-07 23:35:51 -07:00
Dianne Hackborn
e71a630fc6 am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev 
* commit 'ec799e883cb309fc12f22cab19e53f1e27886ba5':
  More on #7296510 Transition from lock screen to dreaming is really bad
 2012-10-07 23:35:47 -07:00
Svetoslav Ganov
fb1245243e am 1b07e93f: am f0b8e3ad: Merge "Adding support to NumberPicker" into jb-mr1-aah-dev 
* commit '1b07e93f3b81fd3a8c0bf3ae46ab15f59507980d':
  Adding support to NumberPicker
 2012-10-07 23:24:11 -07:00
Svetoslav Ganov
1b07e93f3b am f0b8e3ad: Merge "Adding support to NumberPicker" into jb-mr1-aah-dev 
* commit 'f0b8e3adc4031898714e81f4beafedaa13546978':
  Adding support to NumberPicker
 2012-10-07 23:21:20 -07:00
Amith Yamasani
9c2a38ed10 Merge "Fix resource reading for secondary users" into jb-mr1-dev 2012-10-07 22:53:18 -07:00
Daniel Sandler
de8e3b122b Merge "Fix NPE if pulling down QS quickly on very first boot." into jb-mr1-dev 2012-10-07 21:12:04 -07:00
Daniel Sandler
9d09824a66 Fix NPE if pulling down QS quickly on very first boot. 
The cling interception code can interfere with the touch
stream to the point that PanelView might get an ACTION_UP or
_CANCEL without a corresponding ACTION_DOWN, causing
problems.

Bug: 7301742
Change-Id: Idd5074c2544b3238517655ab3c068966bae9f912
 2012-10-07 23:27:30 -04:00
Jim Miller
245b453733 Properly handle cancel event in GlowPadView 
There was a workaround used in a previous release where we effectively
ignored cancel events to work around another bug.  This change removes
the workaround and GlowPadView correctly handles the event.

Bug 6903638

Change-Id: I9b510985c6da346a4e10cf2535267c8d5efa5871
 2012-10-07 20:16:54 -07:00
Svetoslav Ganov
f0b8e3adc4 Merge "Adding support to NumberPicker" into jb-mr1-aah-dev 2012-10-07 19:00:02 -07:00
The Android Automerger
2167d73e9d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 18:58:05 -07:00
Svetoslav Ganov
5dc21d9b34 Adding support to NumberPicker 
Change-Id: I471b995c8d364c2bd5eef3ab0397c17fc77f6ccc
 2012-10-07 18:54:42 -07:00
Daniel Sandler
33a8bd8c40 Merge "New icon for "Sleep now."" into jb-mr1-dev 2012-10-07 18:37:09 -07:00
Eric Laurent
843c539514 Merge "AudioService: fix settings for fixed volume device" into jb-mr1-dev 2012-10-07 18:23:02 -07:00
Romain Guy
133fcdf44b Merge "Clear draw flags when updating TextureView's layer Bug #7171323" into jb-mr1-dev 2012-10-07 18:00:41 -07:00
Romain Guy
52b307ebc8 Clear draw flags when updating TextureView's layer 
Bug #7171323

Finally!

Change-Id: Iefef8fb9a8ef1fe4b374005067145319312c57cf
 2012-10-07 17:57:30 -07:00
Daniel Sandler
118f484424 Fix NPE on devices without notification panel help clings. 
Bug: 7302657
Change-Id: Ia161ea2ef74ef1dfbab55dacaa7274ebc2d66439
 2012-10-07 20:48:28 -04:00
Raph Levien
286da7b6f5 Fix for 7301594 Html.toHtml creating potentially invalid html 
Generate <p dir="rtl"> instead of <p dir=rtl>. The form with the quotes
is cleaner and will reduce warnings in apps that consume the output.

Change-Id: Ic9879c8c882c42079598b741e897a24415d96374
 2012-10-07 16:57:27 -07:00
Eric Laurent
33902db750 AudioService: fix settings for fixed volume device 
Force max volume for devices with fixed volume policy (HDMI, dock...)
when reading the settings from DB. Otherwise, these devices would
get the default volume which is not what we want.

Also fix a problem related to ringer mode management when reloading the
volume settings upon user switch that would cause a muted stream to be
unmuted.

Bug 7301563;

Change-Id: I81cdb97125b845da584ed680181b93c7c1e5903f
 2012-10-07 16:54:47 -07:00