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

88555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
e1339bf493 Fix build 
Change-Id: I0ec6a79ab4e82de04c438b2fb3fa914b21554593
 2012-10-03 09:47:33 -07:00
Baligh Uddin
700649030b am 9e85191e: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '9e85191e260de8745083e68112675ad6dec5984d':
  Revert "Import translations. DO NOT MERGE"
 2012-10-03 09:45:33 -07:00
Baligh Uddin
9e85191e26 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-10-03 09:43:09 -07:00
Baligh Uddin
7c4bab5fbb Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 2012-10-03 09:37:22 -07:00
Baligh Uddin
c591fcbc30 am b044516e: am dfef9b09: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit 'b044516e71e34a5ddc58fbb798cd5ceeeaf8c97a':
  Revert "Import translations. DO NOT MERGE"
 2012-10-03 09:35:56 -07:00
Raph Levien
6b558994d4 Fix for bug 6954231 text wraps on second line and is fused... 
When breaking a line, the paragraphs below the new line break were still
being drawn in their old location. This only happened when the height
was fill_parent, otherwise the height change would force a relayout,
which in turn would do a full invalidation.

This patch checks for changes to the layout height (not just the widget
height, which won't change when it's fill_parent), and invalidates.

Change-Id: I64adb9f5eae0479c1c9c8d37c10c2c27a6f582a8
 2012-10-03 09:34:24 -07:00
Baligh Uddin
b044516e71 am dfef9b09: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit 'dfef9b09c92897d2a758d711881639e04fcbf270':
  Revert "Import translations. DO NOT MERGE"
 2012-10-03 09:33:01 -07:00
Baligh Uddin
20084fee88 am d371df7f: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 
* commit 'd371df7f88ace53844ed6c6bd5f8e28a5132773e':
  Revert "Import translations. DO NOT MERGE"
 2012-10-03 09:32:42 -07:00
Baligh Uddin
dfef9b09c9 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-10-03 09:30:00 -07:00
Baligh Uddin
d371df7f88 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 2012-10-03 09:29:52 -07:00
Baligh Uddin
2ea0be58e3 Revert "Import translations. DO NOT MERGE" 
This reverts commit cf134b51a5a04bed5d10c56c0deb7eba1d03d69b

Change-Id: I7079bb3bc1f6ffa0b72a8878078bd29dc226d8f9
 2012-10-03 09:28:43 -07:00
Baligh Uddin
f97262bf3e Revert "Import translations. DO NOT MERGE" 
This reverts commit 4736039f3347675796a4d7e589584da3d1af275e

Change-Id: Ie271f9a3872578cea458389a5ba7ccaf93beff29
 2012-10-03 09:28:27 -07:00
Chris Wren
310430c73d am ed2f0fb8: am 3edcf5ee: Merge "make bluetooth iconography consistent with other quicksettings icons." into jb-mr1-dev 
* commit 'ed2f0fb81c1a2c2e761af8a982dd768580d0458a':
  make bluetooth iconography consistent with other quicksettings icons.
 2012-10-03 09:24:49 -07:00
Chris Wren
ed2f0fb81c am 3edcf5ee: Merge "make bluetooth iconography consistent with other quicksettings icons." into jb-mr1-dev 
* commit '3edcf5ee908d4e96030dabbd673fbb457c400607':
  make bluetooth iconography consistent with other quicksettings icons.
 2012-10-03 09:21:25 -07:00
Chris Wren
3edcf5ee90 Merge "make bluetooth iconography consistent with other quicksettings icons." into jb-mr1-dev 2012-10-03 09:19:11 -07:00
Chris Wren
b2a7d27bbe make bluetooth iconography consistent with other quicksettings icons. 
Bug: 7217026
Change-Id: I880ee26e1d92ffa49885cf53b8dbab6b13887423
 2012-10-03 12:11:49 -04:00
Baligh Uddin
b92df330d8 Revert "Import translations. DO NOT MERGE" 
Build broken

This reverts commit 6310b2099e98c843b41db0f83461bf07b1a707b4

Change-Id: I14f57183122252583b9b5cde5424595908000e65
 2012-10-03 09:11:19 -07:00
Baligh Uddin
67d53e8487 Revert "Import translations. DO NOT MERGE" 
Build broken.

This reverts commit 2569f8238fa4357292bd427b6e2aaaf1211309fc

Change-Id: I0c4089993b05c5d5285fce1e6d722421b1fe40c4
 2012-10-03 09:10:46 -07:00
Baligh Uddin
576212a117 am 7fafe49a: am 6303084a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7fafe49a80835d62eb250289833cb1b6a6ec15d4':
  Import translations. DO NOT MERGE
 2012-10-03 09:06:37 -07:00
Daniel Sandler
e004899bf8 am 26d4083a: am d14508f8: Merge "Disable statusbar pulldown gesture tracking." into jb-mr1-dev 
* commit '26d4083ac8e517d1ea0518fffca6d3fedd605aea':
  Disable statusbar pulldown gesture tracking.
 2012-10-03 09:04:56 -07:00
Baligh Uddin
7fafe49a80 am 6303084a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6303084a50933de80d6e27d76052f3e5f9e6e312':
  Import translations. DO NOT MERGE
 2012-10-03 09:04:33 -07:00
Baligh Uddin
e361f5ab96 am 1553b245: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '1553b24587143b29e3711518576e6096300e8449':
  Import translations. DO NOT MERGE
 2012-10-03 09:03:13 -07:00
Baligh Uddin
6303084a50 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-03 09:01:55 -07:00
Daniel Sandler
26d4083ac8 am d14508f8: Merge "Disable statusbar pulldown gesture tracking." into jb-mr1-dev 
* commit 'd14508f8c483f1b5c14e8f25b43ad5714b445e28':
  Disable statusbar pulldown gesture tracking.
 2012-10-03 09:01:51 -07:00
Daniel Sandler
d14508f8c4 Merge "Disable statusbar pulldown gesture tracking." into jb-mr1-dev 2012-10-03 09:00:28 -07:00
Baligh Uddin
1553b24587 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-03 09:00:05 -07:00
Baligh Uddin
c3d1fdb86b am 6eac4ea9: am 8a29640e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6eac4ea990f10df9366a78d3629255b1d7e3d373':
  Import translations. DO NOT MERGE
 2012-10-03 08:57:07 -07:00
Baligh Uddin
8ec7e4b458 am b081630a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'b081630a6f2526c872c7c3713e4cc9e6dfd5f498':
  Import translations. DO NOT MERGE
 2012-10-03 08:57:06 -07:00
Baligh Uddin
6eac4ea990 am 8a29640e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8a29640e15471cea832c1738b125ce42c28a837e':
  Import translations. DO NOT MERGE
 2012-10-03 08:54:41 -07:00
Baligh Uddin
8a29640e15 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-03 08:52:47 -07:00
Baligh Uddin
b081630a6f Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-03 08:50:22 -07:00
Daniel Sandler
151f00d8f0 Disable statusbar pulldown gesture tracking. 
Bug: 7164602
Change-Id: Ie6569a7a8a9f462e844ef3088098c3256653f630
 2012-10-03 11:50:02 -04:00
Victoria Lease
4d6c0fa06a am cfebfb68: am fc6770e7: Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev 
* commit 'cfebfb6802c24b4b1166b95bd07b5865f847f9f1':
  Remove checkPermission() call in getAllProviders().
 2012-10-03 08:49:52 -07:00
Victoria Lease
cfebfb6802 am fc6770e7: Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev 
* commit 'fc6770e748bb69f80b7b68942a273335b165000a':
  Remove checkPermission() call in getAllProviders().
 2012-10-03 08:46:15 -07:00
Victoria Lease
fc6770e748 Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev 2012-10-03 08:43:43 -07:00
Daniel Sandler
ede625ac65 am 6a1bebe6: am 1fd34745: Merge "Allow QS to be closed via drag on background." into jb-mr1-dev 
* commit '6a1bebe632167038aa3176eed9c60c6e12869f42':
  Allow QS to be closed via drag on background.
 2012-10-03 08:03:54 -07:00
Daniel Sandler
6a1bebe632 am 1fd34745: Merge "Allow QS to be closed via drag on background." into jb-mr1-dev 
* commit '1fd3474585e2f2c5c87572e8b1c6c0c05b718b1a':
  Allow QS to be closed via drag on background.
 2012-10-03 08:01:53 -07:00
Daniel Sandler
1fd3474585 Merge "Allow QS to be closed via drag on background." into jb-mr1-dev 2012-10-03 07:59:09 -07:00
Michael Jurka
702b28aca6 am 120f360e: am 211f2309: Merge "Fix Recents dismiss/back button behavior" into jb-mr1-dev 
* commit '120f360e03d36a2a074a6f27a4f59bc535e70cfd':
  Fix Recents dismiss/back button behavior
 2012-10-03 07:40:50 -07:00
Daniel Sandler
e5f7ec0576 Allow QS to be closed via drag on background. 
This was already working fine for the area of the panel
below the ScrollView, but intuitively it seems that dragging
in the unused portion of a partially-filled row would behave
the same way. Because it's part of the scrolling content,
though, drags in that region are (correctly) interpreted by
the ScrollView as scrolling requests.

The new QuickSettingsScrollView works around this by
ignoring touch events if its contents are too small to be
scrolled. So in the common case (QS tiles on a phone) you
will be able to drag in any empty area and have your taps
interpreted by the PanelView (which hands them off to the
handle to collapse the view).

We don't handle drags in empty areas when there are too many
tiles to show on-screen, and really, it's impossible to do
so: this gesture should then definitely be interpreted as a
scroll.

Bug: 7203193
Change-Id: I4cfcb029481a88d3604c7105185e8bcb7dbde8a5
 2012-10-03 10:40:00 -04:00
Michael Jurka
120f360e03 am 211f2309: Merge "Fix Recents dismiss/back button behavior" into jb-mr1-dev 
* commit '211f2309ab7feec435d8d64b732d17110d4ba999':
  Fix Recents dismiss/back button behavior
 2012-10-03 07:37:43 -07:00
Michael Jurka
211f2309ab Merge "Fix Recents dismiss/back button behavior" into jb-mr1-dev 2012-10-03 07:34:50 -07:00
The Android Open Source Project
8a146ba3a0 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3162f720cc0aa61ceb1de2446769983525121fdf
 2012-10-03 07:33:56 -07:00
The Android Automerger
83ab5f6ec1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 06:59:41 -07:00
Michael Jurka
e5923631f0 Fix Recents dismiss/back button behavior 
Bug: 7238675
Change-Id: Ic97c38d5559b90c08a32751091d2587d4abfd534
 2012-10-03 15:35:54 +02:00
Jim Miller
eeadda5968 Always enable hardware layers in widgets in keyguard while dragging. 
This fixes a performance issue on the 7" tablet where disabling hardware
layers in landscape mode resulted in extremely bad drawing performance.

The code now enables hardware layers for all the widgets while the user
is dragging.

Fixes bug 7274971

Change-Id: Iafd18fb317fcd3caad45791fe5a0f111d40a1ed4
 2012-10-03 02:35:04 -07:00
Jim Miller
51a2f10c67 am c054751c: am c2a28163: Merge "Update keyguard to send userActivity events" into jb-mr1-dev 
* commit 'c054751cac1557865954aea9596ae2171fe118e5':
  Update keyguard to send userActivity events
 2012-10-03 02:27:52 -07:00
Jim Miller
c054751cac am c2a28163: Merge "Update keyguard to send userActivity events" into jb-mr1-dev 
* commit 'c2a28163165fdd8e2a3173a577ba07cc88ec61fd':
  Update keyguard to send userActivity events
 2012-10-03 02:25:44 -07:00
Jim Miller
c2a2816316 Merge "Update keyguard to send userActivity events" into jb-mr1-dev 2012-10-03 02:23:52 -07:00
Dirk Dougherty
2e1df54368 am c9f19464: am fd28053d: am bd26b2fb: am 5958cb0d: am c395f4a3: Doc change: Add core quality and tablet quality docs, tablet developer stories. 
* commit 'c9f19464b6a39dd09daffc3b4e83c809a8d6c659':
  Doc change: Add core quality and tablet quality docs, tablet developer stories.
 2012-10-03 01:27:20 -07:00