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

92089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Chen
3184787c2d am 935db6c5: am e228b5b9: am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 
* commit '935db6c5616d1bc67c3b077ba7ad8f64173792df':
  Don't alter accessibility JS APIs unless a page is about to load.
 2012-10-12 13:55:21 -07:00
Charles Chen
935db6c561 am e228b5b9: am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 
* commit 'e228b5b920233a151964019fb6c52412cc36425a':
  Don't alter accessibility JS APIs unless a page is about to load.
 2012-10-12 13:52:46 -07:00
Charles Chen
e228b5b920 am 4c38e24a: Merge "Don\'t alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 
* commit '4c38e24afb0fe68d6e9f6e924e6426808be2611a':
  Don't alter accessibility JS APIs unless a page is about to load.
 2012-10-12 13:49:39 -07:00
Keun young Park
7a6dca427b am 09ff8a6f: am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 
* commit '09ff8a6f43dad1e27524e41622392fe040b7bdab':
  fix wrong read size in ToColor_S4444_Opaque
 2012-10-12 13:48:22 -07:00
Charles Chen
4c38e24afb Merge "Don't alter accessibility JS APIs unless a page is about to load." into jb-mr1-dev 2012-10-12 13:46:09 -07:00
Keun young Park
09ff8a6f43 am 27665148: am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 
* commit '27665148cb72cbc7d4d5941f97ae54a73fa58d3c':
  fix wrong read size in ToColor_S4444_Opaque
 2012-10-12 13:45:46 -07:00
Keun young Park
27665148cb am c378656d: Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 
* commit 'c378656d5e0e686d806661bc271de3c7b1726430':
  fix wrong read size in ToColor_S4444_Opaque
 2012-10-12 13:44:08 -07:00
Keun young Park
c378656d5e Merge "fix wrong read size in ToColor_S4444_Opaque" into jb-mr1-dev 2012-10-12 13:41:19 -07:00
Danielle Millett
0ce397624b am 204eadc6: am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 
* commit '204eadc687280d558dd99b7c37c32f988c1cc229':
  Suppressing Face Unlock during phone call - fix b/7339069
 2012-10-12 13:26:41 -07:00
Scott Main
d75456efee am c7d25978: am f94e1296: am 67747a68: Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev 
* commit 'c7d259785e4b03670fa3bc6aa10a744002a70482':
  update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
 2012-10-12 13:26:38 -07:00
Amith Yamasani
79335b4365 am 80ef0935: am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev 
* commit '80ef0935cf31f534badc73104db801dbe89911e4':
  Temporarily disable multiuser for specific builds
 2012-10-12 13:24:53 -07:00
Danielle Millett
204eadc687 am 4ec2381b: am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 
* commit '4ec2381b589fa6627fc824fd4094455432f0055f':
  Suppressing Face Unlock during phone call - fix b/7339069
 2012-10-12 13:22:15 -07:00
Danielle Millett
4ec2381b58 am 8ec3ff8d: Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 
* commit '8ec3ff8dcc68d246fcaafb98050ec9be4f7ec34a':
  Suppressing Face Unlock during phone call - fix b/7339069
 2012-10-12 13:19:35 -07:00
Scott Main
c7d259785e am f94e1296: am 67747a68: Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev 
* commit 'f94e1296a321dc89295849d65b70285a32bf58c4':
  update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
 2012-10-12 13:19:29 -07:00
Amith Yamasani
80ef0935cf am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev 
* commit 'bede7587df180cc0a7335bac03e789249601db9a':
  Temporarily disable multiuser for specific builds
 2012-10-12 13:17:43 -07:00
Scott Main
f94e1296a3 am 67747a68: Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev 
* commit '67747a68c1ce123a4f32876ecf4ccf66d0793b59':
  update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
 2012-10-12 13:16:57 -07:00
Danielle Millett
8ec3ff8dcc Merge "Suppressing Face Unlock during phone call - fix b/7339069" into jb-mr1-dev 2012-10-12 13:16:38 -07:00
Amith Yamasani
bede7587df am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev 
* commit 'fe49af266ea09bb83438c7694051bc950c5c7437':
  Temporarily disable multiuser for specific builds
 2012-10-12 13:15:18 -07:00
Scott Main
67747a68c1 Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev 2012-10-12 13:14:19 -07:00
Amith Yamasani
fe49af266e Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev 2012-10-12 13:13:25 -07:00
Scott Main
da02c6422f update info about usb debugging for mr1 changes 
bug: 7333465 bug: 7318666

Change-Id: If657d5c31f3c0d418448d916d22ce865b2691db2
 2012-10-12 13:11:56 -07:00
Chris Craik
649354027e am 2daca75a: am fb0bfa2b: am 3add43ab: Merge "fix stroke sub-hairline threshold" into jb-mr1-dev 
* commit '2daca75ab1a7ef3d215db686b1cef906aeff5f82':
  fix stroke sub-hairline threshold
 2012-10-12 13:08:34 -07:00
Chris Craik
2daca75ab1 am fb0bfa2b: am 3add43ab: Merge "fix stroke sub-hairline threshold" into jb-mr1-dev 
* commit 'fb0bfa2b03a985c4c3cb548fbd56b4e1d4b62417':
  fix stroke sub-hairline threshold
 2012-10-12 13:06:19 -07:00
Chris Craik
fb0bfa2b03 am 3add43ab: Merge "fix stroke sub-hairline threshold" into jb-mr1-dev 
* commit '3add43ab0e26c9fd44d4dea683092807229eaa59':
  fix stroke sub-hairline threshold
 2012-10-12 13:03:50 -07:00
Chris Craik
3add43ab0e Merge "fix stroke sub-hairline threshold" into jb-mr1-dev 2012-10-12 13:00:59 -07:00
Danielle Millett
d95c659a1d Suppressing Face Unlock during phone call - fix b/7339069 
Now that there isn't a swipe before launching face unlock, face unlock
needs to be suppressed during a phone call.  If it isn't it will popup
on top of the phone call screen.

Change-Id: Id6c4165bf4df606ebf396c151f1c80603d5abca3
 2012-10-12 15:51:09 -04:00
Chris Craik
2154af209f fix stroke sub-hairline threshold 
bug:7339943

Change-Id: I4051a03f4cd5bd2c313840208540601fb7a056e2
 2012-10-12 12:45:08 -07:00
Amith Yamasani
ff54920ed2 Temporarily disable multiuser for specific builds 
Enable switching through power menu for other builds

Change-Id: I0bd8450583e078b0a83fb639337427ab84db5ab8
 2012-10-12 12:44:49 -07:00
Uriel Rodriguez
39fd6917ad am 4361b2e8: am 6561f953: am bfbd58de: Merge "Fix bug 7338736. Only starting FUL if the screen is on" into jb-mr1-dev 
* commit '4361b2e8624a84e806b89fab57cf58f8e829444b':
  Fix bug 7338736. Only starting FUL if the screen is on
 2012-10-12 12:36:44 -07:00
Uriel Rodriguez
4361b2e862 am 6561f953: am bfbd58de: Merge "Fix bug 7338736. Only starting FUL if the screen is on" into jb-mr1-dev 
* commit '6561f953b2bfef3bb8292d07d35cadb1cd2bd9d1':
  Fix bug 7338736. Only starting FUL if the screen is on
 2012-10-12 12:34:33 -07:00
Uriel Rodriguez
6561f953b2 am bfbd58de: Merge "Fix bug 7338736. Only starting FUL if the screen is on" into jb-mr1-dev 
* commit 'bfbd58de8d0d5487f2d8a67e99a9854019c22039':
  Fix bug 7338736. Only starting FUL if the screen is on
 2012-10-12 12:32:19 -07:00
Uriel Rodriguez
bfbd58de8d Merge "Fix bug 7338736. Only starting FUL if the screen is on" into jb-mr1-dev 2012-10-12 12:28:50 -07:00
John Spurlock
f5bc42dbf8 Keep QS brightness slider icon in sync. 
It now reflects auto-on or auto-off as it changes.

Bug:7303599
Change-Id: I1b1bd6a0545950795f83449c3778e91afa9d04a5
 2012-10-12 15:24:36 -04:00
Jeff Sharkey
3b5259fcbe am 1e8f7262: am a00ffa53: am 1016b288: Merge "Pm command to get maximum users." into jb-mr1-dev 
* commit '1e8f7262febf77580e830374af2f5c5236081a0f':
  Pm command to get maximum users.
 2012-10-12 12:21:46 -07:00
Jeff Sharkey
1e8f7262fe am a00ffa53: am 1016b288: Merge "Pm command to get maximum users." into jb-mr1-dev 
* commit 'a00ffa53fbe7ced0147451242232f47d117d5e2d':
  Pm command to get maximum users.
 2012-10-12 12:19:34 -07:00
Uriel Rodriguez
94c7b14b1a Fix bug 7338736. Only starting FUL if the screen is on 
Change-Id: Id767cf1394218a7e9dccabcdd9aae5af27b493b1
 2012-10-12 15:17:25 -04:00
Jeff Sharkey
a00ffa53fb am 1016b288: Merge "Pm command to get maximum users." into jb-mr1-dev 
* commit '1016b2881d2b5f5d5e142afa287bd876b6360c2b':
  Pm command to get maximum users.
 2012-10-12 12:17:17 -07:00
Jeff Sharkey
1016b2881d Merge "Pm command to get maximum users." into jb-mr1-dev 2012-10-12 12:14:29 -07:00
Tim Murray
091f7ccf9a Fix cycle detection for SGs. 
bug 7318821

Change-Id: I695d7230551d8512c6c3f0c31c57f12498da7036
 2012-10-12 12:07:09 -07:00
Scott Main
e249763db1 small update to Toast guide, flatten sidenav for notifications/toasts, 
new screenshots for notifications

Change-Id: I0c02e9e6db70a60ca299ff7f0caa7c8276b7ab68
 2012-10-12 12:06:10 -07:00
The Android Automerger
4b662907b4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 11:50:03 -07:00
Fabrice Di Meglio
35c492884c am d828e328: am a1d72e15: am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 
* commit 'd828e328bc6cfbcd30679b95f615e217ab56983d':
  Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
 2012-10-12 11:46:05 -07:00
Fabrice Di Meglio
d828e328bc am a1d72e15: am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 
* commit 'a1d72e15f6fd5e6e330a70d550327ab8c8fcdbcf':
  Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
 2012-10-12 11:43:43 -07:00
alanv
03e636f33d Don't alter accessibility JS APIs unless a page is about to load. 
Previously we were adding and removing the APIs on window attach and
detach, but a page's life cycle is not related to attach/detach. This
patch also ensures that ChromeVox is not null before calling. Includes
formatting fixes and extra comments in the waitForResultTimedLocked
method to improve readability. Fixes parsing of integer resultId, which
was being parsed using Long.

Bug: 7328348
Change-Id: I6b81a8e4d8209f8e99419da9b8250abe57e25048
 2012-10-12 11:42:37 -07:00
Fabrice Di Meglio
a1d72e15f6 am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 
* commit '6ffbe600696396a0444f20f61223923146e9520b':
  Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
 2012-10-12 11:42:17 -07:00
Fabrice Di Meglio
6ffbe60069 Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 2012-10-12 11:39:23 -07:00
Keun young Park
038953da05 fix wrong read size in ToColor_S4444_Opaque 
- S4444 takes 16bits, not 32bits
- This caused sporadic failure in CTS BitmapFactoryTest#testDecodeStream4

Bug: 7179389
Change-Id: Ib36a3a569b3149d74f36ae67a069a7b65a72e895
 2012-10-12 11:36:13 -07:00
Mike Cleron
223f3373d2 am d4c34387: am f4607172: am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 
* commit 'd4c34387a6f319a5d824cb77f18966378ed065d7':
  Change keyguard to use single-stage unlock.
 2012-10-12 11:17:41 -07:00
Baligh Uddin
49cf4d5eef am 40344d8f: (-s ours) am dc255e43: am 5650d86a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '40344d8f19e154b29c8d5699545d1156b1ac22e4':
  Import translations. DO NOT MERGE
 2012-10-12 11:14:29 -07:00
Baligh Uddin
77ef24377c am e616c918: (-s ours) am 18ab87f8: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e616c918ae748d681d5b787c3ec795a3b5f1f0b3':
  Import translations. DO NOT MERGE
 2012-10-12 11:14:25 -07:00