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

91533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
6acf744fab am f4a1dad6: am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit 'f4a1dad63db89b805df0c83b2044dad0d60e3686':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:34:52 -07:00
Fabrice Di Meglio
f4a1dad63d am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:32:47 -07:00
Svetoslav Ganov
38fbe45d7d am c4160940: am e34b3243: am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev 
* commit 'c41609408bbafa48cb222be40a4e43b88d3d09dc':
  Fix WebView accessibility scripts.
 2012-10-10 17:31:34 -07:00
Fabrice Di Meglio
5b04d0320b am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit 'b8021a88e5c00ebd985a348b56af29c95a178a90':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:29:52 -07:00
Svetoslav Ganov
c41609408b am e34b3243: am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev 
* commit 'e34b32430ab8885951dbedc0a2c339da654c989c':
  Fix WebView accessibility scripts.
 2012-10-10 17:29:25 -07:00
Romain Guy
451f912411 am 146f0412: am 21ff8c9c: am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 
* commit '146f04122ae674419fd35ff6d683b58e437d6136':
  Prevent possible divide by 0 Bug #7307304
 2012-10-10 17:26:42 -07:00
Fabrice Di Meglio
b8021a88e5 Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 2012-10-10 17:26:41 -07:00
Svetoslav Ganov
e34b32430a am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev 
* commit '02f0daa580a3d97f64e126198e42c3247ee37517':
  Fix WebView accessibility scripts.
 2012-10-10 17:26:17 -07:00
Svetoslav Ganov
02f0daa580 Merge "Fix WebView accessibility scripts." into jb-mr1-dev 2012-10-10 17:23:48 -07:00
Romain Guy
1ced04fce1 am 9068e1b6: am 3bb02a34: am 38a64240: Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 
* commit '9068e1b6cc6963ce5031e7a4c9b96965b099c2a6':
  Allow 9patches to shrink Bug #7307304
 2012-10-10 17:23:39 -07:00
Jean-Michel Trivi
7e04bd1cc1 am afb19545: am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev 
* commit 'afb195453a40ba41ee4a08a1d920110c5b8af58e':
  Don't play notifications during speech recognition
 2012-10-10 17:23:22 -07:00
Adam Powell
01c0eecf8d am 223e0a8a: am cd480277: am fb901079: Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 
* commit '223e0a8a117c8e54f3bbe9976de57f556db047c4':
  Fix MediaRouter prioritization around a2dp devices
 2012-10-10 17:23:18 -07:00
Brian Colonna
7b19cf630d am c32f65ba: am 4d757625: am 6b17799b: Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 
* commit 'c32f65bac00cb2678e669c250c6263860fc501f3':
  Suppressing FUL after user switch (fix b/7316467)
 2012-10-10 17:23:14 -07:00
Jeff Sharkey
852ebc0cee am 50035e83: am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '50035e83963a20e91a764054004fbda8f0a85807':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 17:23:09 -07:00
Katie McCormick
a5259759eb am ef0eaa5e: am ed6059a2: am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit 'ef0eaa5e661d9eb21974c290a121b35fc78b8bcb':
  Doc changes: misc GCM updates.
 2012-10-10 17:22:50 -07:00
Romain Guy
146f04122a am 21ff8c9c: am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 
* commit '21ff8c9cf22b38ad577d7eb01088cb49274cb22d':
  Prevent possible divide by 0 Bug #7307304
 2012-10-10 17:21:07 -07:00
Romain Guy
21ff8c9cf2 am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 
* commit '1460c8ca094e2e1cbf19a71319341fbc7678cfd9':
  Prevent possible divide by 0 Bug #7307304
 2012-10-10 17:19:06 -07:00
Romain Guy
1460c8ca09 Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 2012-10-10 17:16:34 -07:00
Romain Guy
9068e1b6cc am 3bb02a34: am 38a64240: Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 
* commit '3bb02a347f453136dff28720aaf9d7db2f517bb4':
  Allow 9patches to shrink Bug #7307304
 2012-10-10 17:15:37 -07:00
Romain Guy
3bb02a347f am 38a64240: Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 
* commit '38a642401332088cb8e09b23b6cdb617a7a70ccd':
  Allow 9patches to shrink Bug #7307304
 2012-10-10 17:13:38 -07:00
Romain Guy
c37f349ecf Prevent possible divide by 0 
Bug #7307304

Should never happen, but eh :))

Change-Id: Ic7a09fd5c7a3622e6b4963f9ee6920e232018e2e
 2012-10-10 17:13:36 -07:00
Romain Guy
38a6424013 Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 2012-10-10 17:10:24 -07:00
alanv
df313699ba Fix WebView accessibility scripts. 
Ensures A11y APIs are added to WebView before page loads. Prevents calls
to TTS before init and after shutdown. Ensures calls to TTS are thread-
safe. Activates and deactivates feedback from AndroidVox when view is
attached and detached. Adds a flag for logging debug output, as well as
a lot of debug output.

Bug: 7326781
Change-Id: I5d4ab7f9fb1669f98ef05ae207e897565d3086c9
 2012-10-10 17:09:11 -07:00
Fabrice Di Meglio
2918ab6c32 Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int) 
- rename to LayoutParams.resolveLayoutDirection(int)
- upate 17.txt too

Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
 2012-10-10 16:47:51 -07:00
Jean-Michel Trivi
afb195453a am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev 
* commit '7e466e894ad4738a76c94c871cfc2f900518aea8':
  Don't play notifications during speech recognition
 2012-10-10 16:36:07 -07:00
Adam Powell
223e0a8a11 am cd480277: am fb901079: Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 
* commit 'cd4802776d6ea817e08619956d5fe35c11acc225':
  Fix MediaRouter prioritization around a2dp devices
 2012-10-10 16:34:23 -07:00
Brian Colonna
c32f65bac0 am 4d757625: am 6b17799b: Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 
* commit '4d7576254f9604f60332d16951a220f856f79b51':
  Suppressing FUL after user switch (fix b/7316467)
 2012-10-10 16:34:15 -07:00
Jean-Michel Trivi
7e466e894a am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev 
* commit 'bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4':
  Don't play notifications during speech recognition
 2012-10-10 16:33:15 -07:00
Jeff Sharkey
50035e8396 am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '89be4267d0a23ca258af607291bc4f905f963185':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:32:36 -07:00
Adam Powell
cd4802776d am fb901079: Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 
* commit 'fb9010798d9352fd4f9413f882ffd214d69610b5':
  Fix MediaRouter prioritization around a2dp devices
 2012-10-10 16:31:33 -07:00
Brian Colonna
4d7576254f am 6b17799b: Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 
* commit '6b17799b253dad55dc3df7929342d7effa3137ea':
  Suppressing FUL after user switch (fix b/7316467)
 2012-10-10 16:31:29 -07:00
Jean-Michel Trivi
bcfc1ca8ab Merge "Don't play notifications during speech recognition" into jb-mr1-dev 2012-10-10 16:30:56 -07:00
Jeff Sharkey
89be4267d0 am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '03bd101b887d9741230ac6a7d296d90436020b8c':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:29:39 -07:00
Adam Powell
fb9010798d Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 2012-10-10 16:28:29 -07:00
Brian Colonna
6b17799b25 Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 2012-10-10 16:28:29 -07:00
Jeff Sharkey
03bd101b88 Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 2012-10-10 16:26:49 -07:00
Katie McCormick
ef0eaa5e66 am ed6059a2: am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit 'ed6059a292330a1d26953a485da6e0c2ede60ba7':
  Doc changes: misc GCM updates.
 2012-10-10 16:14:31 -07:00
Katie McCormick
ed6059a292 am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit '1dbce5f1e55bdc61a767cd82b59a3919a4683b5e':
  Doc changes: misc GCM updates.
 2012-10-10 16:12:06 -07:00
Katie McCormick
1dbce5f1e5 am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit '05ab277c21731ab11333c56d7d2266b9b1c4d46d':
  Doc changes: misc GCM updates.
 2012-10-10 16:09:41 -07:00
Jeff Sharkey
5ed9d68040 Move lockscreen to using haptic feedback setting. 
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.

Bug: 7318772
Change-Id: I637c392a1aaa22403cb20da4723f90c3b2e3de19
 2012-10-10 16:08:47 -07:00
Katie McCormick
05ab277c21 am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit 'fa4865f680cc151ff051b7a82fb0e94145d70377':
  Doc changes: misc GCM updates.
 2012-10-10 16:06:19 -07:00
Romain Guy
41d35aef06 Allow 9patches to shrink 
Bug #7307304

Change-Id: I1fabf6df99c18c86ab1ec0e1e398a3d6d4098496
 2012-10-10 16:06:04 -07:00
Craig Mautner
518bafeb9c am 132134a1: am 82314aeb: am 0a75ed08: Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev 
* commit '132134a19aaaeefb5d722856a8f4b17c49967f96':
  Revert "Remove debugging statements before final ROM."
 2012-10-10 15:47:04 -07:00
Craig Mautner
132134a19a am 82314aeb: am 0a75ed08: Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev 
* commit '82314aeb550987adc0f604e9d3d21567219a1a32':
  Revert "Remove debugging statements before final ROM."
 2012-10-10 15:44:03 -07:00
Svetoslav Ganov
724d619120 am 867644c1: am cafd061a: am f864401c: Merge changes I00665385,Ic76db232 into jb-mr1-dev 
* commit '867644c1317447fda2402c4fc024e44c254a74e8':
  Send accessibility notification events only for the current user.
  No sound produced on global actions dialog pops up if no vibrator is present.
 2012-10-10 15:44:03 -07:00
Svetoslav Ganov
867644c131 am cafd061a: am f864401c: Merge changes I00665385,Ic76db232 into jb-mr1-dev 
* commit 'cafd061ae7ef5ff8ca3c8b28b84d5f1d94e71b01':
  Send accessibility notification events only for the current user.
  No sound produced on global actions dialog pops up if no vibrator is present.
 2012-10-10 15:42:15 -07:00
Craig Mautner
82314aeb55 am 0a75ed08: Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev 
* commit '0a75ed0805dd7f97ff058623eb8e4f4b258c44ab':
  Revert "Remove debugging statements before final ROM."
 2012-10-10 15:42:09 -07:00
Adam Powell
3f369684e1 Fix MediaRouter prioritization around a2dp devices 
Most recently connected audio output gets priority. Wifi display will
dominate over everything.

Bug 7324334

Change-Id: I29b59570a2e9b5352be436dc5b7a0a6861dfae6b
 2012-10-10 15:39:59 -07:00
Craig Mautner
0a75ed0805 Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev 2012-10-10 15:38:58 -07:00
Svetoslav Ganov
cafd061ae7 am f864401c: Merge changes I00665385,Ic76db232 into jb-mr1-dev 
* commit 'f864401cfa1fdf863003f9d2d624fd742f7b5f4b':
  Send accessibility notification events only for the current user.
  No sound produced on global actions dialog pops up if no vibrator is present.
 2012-10-10 15:38:57 -07:00