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

92426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
0e5220af0f am 66add489: am 0e30c05e: am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev 
* commit '66add489df50fe6c86f95524888ef2af87baf942':
  Frequency conflict handling
 2012-10-17 12:00:29 -07:00
Irfan Sheriff
66add489df am 0e30c05e: am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev 
* commit '0e30c05e8a627fcd53a1f26db7c92ac837bc406b':
  Frequency conflict handling
 2012-10-17 11:57:36 -07:00
Irfan Sheriff
0e30c05e8a am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev 
* commit 'd4a149d9d06f3a1914babf70c93131f7211eaa2b':
  Frequency conflict handling
 2012-10-17 11:55:27 -07:00
Irfan Sheriff
d4a149d9d0 Merge "Frequency conflict handling" into jb-mr1-dev 2012-10-17 11:52:14 -07:00
Yu Shan Emily Lau
fb56f04af9 am 35f6ab81: am 1e16f1cf: am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev 
* commit '35f6ab816d63d40971a84df9ee57f62c577f9e6e':
  Fix the NPE for the memwriter.
 2012-10-17 11:29:30 -07:00
Yu Shan Emily Lau
35f6ab816d am 1e16f1cf: am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev 
* commit '1e16f1cf054192d1e85d231b049596d9bf8779f2':
  Fix the NPE for the memwriter.
 2012-10-17 11:26:45 -07:00
Fabrice Di Meglio
7cfd0a2809 am 86a8b251: am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit '86a8b25114fbc033c474a214699ad77a9140af5e':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:26:41 -07:00
Fabrice Di Meglio
86a8b25114 am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'd89893642f81f854455da601e4735d226cf95214':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:23:55 -07:00
Yu Shan Emily Lau
1e16f1cf05 am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev 
* commit 'fc2652efedeaae40c4a3748a8de9ee833e1443e1':
  Fix the NPE for the memwriter.
 2012-10-17 11:23:54 -07:00
Fabrice Di Meglio
7daab45967 am 7e8d16fb: am 84cb0b17: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 
* commit '7e8d16fbfd8b83a743527412edf6bb4e767f37aa':
  Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
 2012-10-17 11:23:54 -07:00
Fabrice Di Meglio
7e8d16fbfd am 84cb0b17: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 
* commit '84cb0b17e64530a3f8fa7c70d1813b59006b675f':
  Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
 2012-10-17 11:21:01 -07:00
Fabrice Di Meglio
d89893642f am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'e9a33c6098f51c687665adbed799860df2569ad0':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:21:01 -07:00
Yu Shan Emily Lau
fc2652efed Merge "Fix the NPE for the memwriter." into jb-mr1-dev 2012-10-17 11:20:26 -07:00
Fabrice Di Meglio
84cb0b17e6 am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 
* commit '161cfef36d8fac79f8665ecdb78d3f8f8f5ba5af':
  Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
 2012-10-17 11:18:13 -07:00
Fabrice Di Meglio
e9a33c6098 Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 2012-10-17 11:18:13 -07:00
Daniel Sandler
8ef8604648 am 0ce43597: am 85b882f5: am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev 
* commit '0ce43597d6dbb7cabc45ebc532ab5f67b6590b9a':
  Fix Bluetooth QS tile.
 2012-10-17 11:13:38 -07:00
Daniel Sandler
de1359a3bb am 4accd6cc: am f78a2353: am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 
* commit '4accd6cc374e04663ac6ad8d70aed9ad23222298':
  Fade out the notification/settings panels just before close.
 2012-10-17 11:13:33 -07:00
Daniel Sandler
c4c0b54e8e am cb4fa357: am 581c5703: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit 'cb4fa3575a1214adcfc383fed48f03052ed32a08':
  Fixes for QS:
 2012-10-17 11:13:27 -07:00
Fabrice Di Meglio
161cfef36d Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 2012-10-17 11:13:20 -07:00
Yu Shan Emily Lau
87b8a1c3b6 Fix the NPE for the memwriter. 
Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
 2012-10-17 11:10:32 -07:00
Daniel Sandler
0ce43597d6 am 85b882f5: am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev 
* commit '85b882f5a5539d22393efd27a610c355d8b50723':
  Fix Bluetooth QS tile.
 2012-10-17 11:10:22 -07:00
Daniel Sandler
4accd6cc37 am f78a2353: am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 
* commit 'f78a2353af27a1a7603298a6b960d2a645d898ba':
  Fade out the notification/settings panels just before close.
 2012-10-17 11:10:18 -07:00
Daniel Sandler
cb4fa3575a am 581c5703: am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit '581c5703fc5304548590b4ef5e692c7e7704b342':
  Fixes for QS:
 2012-10-17 11:10:15 -07:00
Daniel Sandler
85b882f5a5 am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev 
* commit 'b702e5df25a4537e8471d9b14c3cff4f3d2cb468':
  Fix Bluetooth QS tile.
 2012-10-17 11:08:04 -07:00
Daniel Sandler
f78a2353af am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 
* commit '25e1456ed8de57be3c551b39bf510dd0218a0d2b':
  Fade out the notification/settings panels just before close.
 2012-10-17 11:07:59 -07:00
Daniel Sandler
581c5703fc am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit 'f06125aab027c809095304f30d109d627cd995a6':
  Fixes for QS:
 2012-10-17 11:07:56 -07:00
Daniel Sandler
b702e5df25 Merge "Fix Bluetooth QS tile." into jb-mr1-dev 2012-10-17 11:06:21 -07:00
Daniel Sandler
25e1456ed8 Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 2012-10-17 11:06:21 -07:00
Daniel Sandler
f06125aab0 Merge "Fixes for QS:" into jb-mr1-dev 2012-10-17 11:05:20 -07:00
Justin Ho
8814ec3796 am 47270268: am 8598646e: am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '472702687d174c126752259485b83c39f3eb2801':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:58:21 -07:00
Justin Ho
472702687d am 8598646e: am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '8598646e5b93e8adf4bcd2489365900d2a4776c6':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:56:33 -07:00
Kenny Root
ebf5569880 am 63a183c4: Merge "resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp" into jb-mr1-dev-plus-aosp 
* commit '63a183c41f26e4eb475dfbcc4386b37372eb5fba':
  Fix mistaken removal of setfilecon
 2012-10-17 10:53:51 -07:00
Dianne Hackborn
61d5c431fd am 0307bb5d: am e7819f86: am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit '0307bb5de2db991f2427f12702c106aaedf662b9':
  Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
 2012-10-17 10:53:47 -07:00
Justin Ho
8598646e5b am 144d4055: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '144d405511e9ed685568e50db87b22cc42b6a252':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 10:53:43 -07:00
Kenny Root
63a183c41f Merge "resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp" into jb-mr1-dev-plus-aosp 2012-10-17 10:51:26 -07:00
Dianne Hackborn
0307bb5de2 am e7819f86: am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit 'e7819f86e3d2986b8c487216244498102411c805':
  Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
 2012-10-17 10:50:43 -07:00
Justin Ho
144d405511 Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 10:50:39 -07:00
Kenny Root
367400491a resolved conflicts for merge of 40f2f751 to jb-mr1-dev-plus-aosp 
Change-Id: I6075e2bf98b0f8310c93fac649c34cbbbd89707f
 2012-10-17 10:50:14 -07:00
Dianne Hackborn
e7819f86e3 am dec9e164: Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 
* commit 'dec9e1640a7ae0b20f7fe79fa9c8cecacc4e07a9':
  Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)
 2012-10-17 10:47:48 -07:00
Justin Ho
57fca90ac6 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit dcf59629beed8182759a1068ab8ee997935bef82

Change-Id: I27426a0ffe993973ffb0b05ce1ed3afe73fcd87d
 2012-10-17 10:47:39 -07:00
Dianne Hackborn
dec9e1640a Merge "Fix issue #7343719: GlobalActions dialog (power off / airplane mode / sound off)" into jb-mr1-dev 2012-10-17 10:45:08 -07:00
Daniel Sandler
025e7cb4a1 Fade out the notification/settings panels just before close. 
Bug: 7362346
Change-Id: I437a98f4400c0a14b038c268ccf78a322d992681
 2012-10-17 13:42:58 -04:00
Daniel Sandler
6e2810bb98 Fixes for QS: 
- don't show clear all on the settings page if a
   notification comes in
 - delay makeExpandedInvisible when all panels are collapsed
   to ensure that the last frame of panel animation can show
   in its entirety

Bug: 7362346
Change-Id: I5303f03ea5ee654e222aff0b62ab69f98dc16978
 2012-10-17 13:42:57 -04:00
Irfan Sheriff
9f452d0b5c Frequency conflict handling 
We now show a dialog to user and let him handle whether to choose wifi
or p2p when there is a frequency conflict.

If user chooses to disable wifi tempoarily, we disconnect wifi until
p2p connection is established and removed.

Bug: 6590401
Change-Id: I73871ddcb3732ae61997d8771b6aa90ad56270af
 2012-10-17 10:35:39 -07:00
Bart Sears
7dbf63665b am ae232842: am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit 'ae232842c86f108da5a73c047eff5a09e9c9c222':
  Fix native crash while saving a panorama.
 2012-10-17 10:28:52 -07:00
Bart Sears
ae232842c8 am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit 'b112bb6684b336dc4f3287af65708e0934933d3d':
  Fix native crash while saving a panorama.
 2012-10-17 10:26:22 -07:00
Bart Sears
b112bb6684 am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev 
* commit '0ee71adde01298784a2cbb667c4c1570bdbf0af0':
  Fix native crash while saving a panorama.
 2012-10-17 10:23:42 -07:00
Bart Sears
0ee71adde0 Merge "Fix native crash while saving a panorama." into jb-mr1-dev 2012-10-17 10:20:50 -07:00
Kenny Root
115198ba1a am ed3ce513: Fix bad merge 
* commit 'ed3ce513a64b9f26358dc77187d6d04fe91abae9':
  Fix bad merge
 2012-10-17 10:10:27 -07:00
Kenny Root
ed3ce513a6 Fix bad merge 
Change-Id: I9f05f96e3607b994368a8d4e1e454af8fe84424d
 2012-10-17 10:06:17 -07:00