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

89800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
d4c34387a6 am f4607172: am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 
* commit 'f46071724b992807d7c58c97b85cb6d4c044db75':
  Change keyguard to use single-stage unlock.
 2012-10-12 11:13:57 -07:00
Marco Nelissen
39ca39b026 Rewind buffer before copying into it. 
b/7334897

Change-Id: I83f795cb662d0845314bfb80b9a27ae45b2a0517
 2012-10-12 11:13:10 -07:00
Mike Cleron
f46071724b am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 
* commit '732d88e14e4418feba1b80cf1d6010cddb1d5de5':
  Change keyguard to use single-stage unlock.
 2012-10-12 11:10:29 -07:00
Baligh Uddin
40344d8f19 am dc255e43: am 5650d86a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'dc255e433f42939b0c8178ae80f2048c0c4f52ce':
  Import translations. DO NOT MERGE
 2012-10-12 11:10:08 -07:00
Baligh Uddin
e616c918ae am 18ab87f8: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '18ab87f8200d899082bfc39f4e80534222bd30b7':
  Import translations. DO NOT MERGE
 2012-10-12 11:10:07 -07:00
Mike Cleron
732d88e14e Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 2012-10-12 11:07:52 -07:00
Patrick Brady
d16dedf305 am 67ebb2f8: am 957b27f6: Merge "Revert "Always show emergency button on selector view screen in keyguard." I\'m reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I\'ll handle re-adding it if needed." into jb-mr1-dev 
* commit '67ebb2f8512bbf9ecceb2c1570bcc38487f35b1e':
  Revert "Always show emergency button on selector view screen in keyguard."  I'm reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I'll handle re-adding it if needed.
 2012-10-12 11:04:10 -07:00
Baligh Uddin
069b87cf1f am d344da78: am a1ecd5a3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd344da78838a6a8c8d7091f714c27ec20039e505':
  Import translations. DO NOT MERGE
 2012-10-12 11:03:55 -07:00
Baligh Uddin
5fc1d86572 am 44467c50: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '44467c50280f317420adaa6dc3ddbc9bd4abecc5':
  Import translations. DO NOT MERGE
 2012-10-12 11:03:51 -07:00
Isaac Katzenelson
381c7fd6ae am 1586c96a: am 317beb1c: Merge "New alarm ringtones" into jb-mr1-dev 
* commit '1586c96aae65c0df93ee6c4eb0bcddc88634ab7d':
  New alarm ringtones
 2012-10-12 11:03:40 -07:00
Christopher Tate
c025df6276 am d6790721: am a3f33309: Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev 
* commit 'd6790721a9d8be03255dfc96e75abdf3a1bbe4d2':
  DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
 2012-10-12 11:03:34 -07:00
John Reck
e45ecba93b am be0786ae: am b746febc: Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev 
* commit 'be0786ae0bcd8a9d7bbcc8b81afa8e07767cd3dc':
  Center text selection point to avoid rounding glitches
 2012-10-12 11:03:29 -07:00
Jim Miller
855cd7763a am 8a4408cc: am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev 
* commit '8a4408ccdf2f2b6720983566725a475b8d99560d':
  Always show emergency button on selector view screen in keyguard.
 2012-10-12 11:03:21 -07:00
Joe Malin
bbbb1298e3 am 289eb791: am 87afd6eb: am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide 
* commit '289eb791068d0b10ca07534fdeb97ec84f2f2dc9':
  DOC CHANGE: Notifications Guide
 2012-10-12 11:02:58 -07:00
Stephen Hines
af23ed324a am 3e68d87d: am f8814489: Merge "Update compatibility library tests" into jb-mr1-dev 
* commit '3e68d87d6b58e9848a7ba60b2f40430ff6fff7a3':
  Update compatibility library tests
 2012-10-12 11:02:45 -07:00
Jeff Sharkey
4c76ea6b88 Pm command to get maximum users. 
Used to drive CTS tests.  Also print success message when removing
a user.

Bug: 7334718
Change-Id: Ia3886ddf860cd000ce567b0fed2ef0a4e2a2295c
 2012-10-12 10:46:01 -07:00
The Android Automerger
653d39afa3 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:26:43 -07:00
Baligh Uddin
dc255e433f am 5650d86a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5650d86aa3c6d9329638015b166027d60521dc84':
  Import translations. DO NOT MERGE
 2012-10-12 09:32:17 -07:00
Baligh Uddin
5650d86aa3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-12 09:29:55 -07:00
Baligh Uddin
18ab87f820 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-12 09:26:41 -07:00
The Android Automerger
6fa5a242de merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 06:59:26 -07:00
Jim Miller
0ff7f010f8 Change keyguard to use single-stage unlock. 
Change-Id: Ica175a90ef4400941c7c4f05a494003b85d5e88c
 2012-10-12 03:53:57 -07:00
Patrick Brady
67ebb2f851 am 957b27f6: Merge "Revert "Always show emergency button on selector view screen in keyguard." I\'m reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I\'ll handle re-adding it if needed." into jb-mr1-dev 
* commit '957b27f62b5dd439c71ab8e2c0e46313ea89d4e8':
  Revert "Always show emergency button on selector view screen in keyguard."  I'm reverting for now while we sort out the actual requirements.  Sorry for the thrash, Jaggies.  I'll handle re-adding it if needed.
 2012-10-11 23:07:43 -07:00
Patrick Brady
957b27f62b Merge "Revert "Always show emergency button on selector view screen in keyguard." I'm reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I'll handle re-adding it if needed." into jb-mr1-dev 2012-10-11 23:04:34 -07:00
Baligh Uddin
d344da7883 am a1ecd5a3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a1ecd5a30cd7f93beed0943ff403227d04d9b34c':
  Import translations. DO NOT MERGE
 2012-10-11 21:27:03 -07:00
Baligh Uddin
a1ecd5a30c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-11 21:25:02 -07:00
Baligh Uddin
44467c5028 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-11 21:22:38 -07:00
Patrick Brady
b6a1ea78b8 Revert "Always show emergency button on selector view screen in keyguard." I'm reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I'll handle re-adding it if needed. 
This reverts commit 43c5b5568539dd1726fff75f7bee7eb481f87844

Change-Id: I2289658d3afaea9d1655b1811f49435de6c130e1
 2012-10-11 21:09:14 -07:00
Isaac Katzenelson
1586c96aae am 317beb1c: Merge "New alarm ringtones" into jb-mr1-dev 
* commit '317beb1c3e63e18bdbf2e55aee1a91df70f7d815':
  New alarm ringtones
 2012-10-11 20:42:57 -07:00
Isaac Katzenelson
317beb1c3e Merge "New alarm ringtones" into jb-mr1-dev 2012-10-11 20:40:47 -07:00
Isaac Katzenelson
8f2e74b075 New alarm ringtones 
Bug: 7299078

Adding 2 new sound files, replacing 3 more.
Added a new makefile with the 2 new files.

Change-Id: I417dd6cfe8ae575fcb2cefbe4fd7f59b762c708b
 2012-10-11 19:55:53 -07:00
Christopher Tate
d6790721a9 am a3f33309: Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev 
* commit 'a3f33309d7464a7ccca76b0475e2dfd009956e49':
  DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
 2012-10-11 19:26:09 -07:00
Christopher Tate
a3f33309d7 Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev 2012-10-11 19:23:07 -07:00
Fabrice Di Meglio
3cc10f420f Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware 
- add horizontal gravity support
- use gravity for doing layout depending on layout direction

Change-Id: I562e824d15da9b00e1392f125b293aee21f8ee16
 2012-10-11 19:17:39 -07:00
Baligh Uddin
d3dc37d34e Import translations. DO NOT MERGE 
Change-Id: I7f9b815759c2f9f2e2d41811df14dfc8f9370da8
Auto-generated-cl: translation import
 2012-10-11 18:45:04 -07:00
Baligh Uddin
7e78e66f89 Import translations. DO NOT MERGE 
Change-Id: I16866bcac09dbd1b0b91032df7173214786551df
Auto-generated-cl: translation import
 2012-10-11 18:44:09 -07:00
Jim Miller
e955121d6e Partial fix for blank widget page 
The code really shouldn't select the page until after the view has been
removed and had a chance to measure itself.  The fix is to post a message
to select the correct widget page.

Bug 7334209

Change-Id: I5c2d59b00b3c502893da6000154ce6cdc79ecc1c
 2012-10-11 18:30:33 -07:00
Baligh Uddin
40ad86e026 Import translations. DO NOT MERGE 
Change-Id: I4ef6935d25a8428069225adb3648701e93fd9c17
Auto-generated-cl: translation import
 2012-10-11 18:30:04 -07:00
Baligh Uddin
c60b9f66fa Import translations. DO NOT MERGE 
Change-Id: Ie30e500b62e03b710b99ec0eb1a8f98d9ad46106
Auto-generated-cl: translation import
 2012-10-11 18:28:27 -07:00
John Reck
be0786ae0b am b746febc: Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev 
* commit 'b746febca2e3f21704556647cd987fdf902fb779':
  Center text selection point to avoid rounding glitches
 2012-10-11 18:27:56 -07:00
John Reck
b746febca2 Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev 2012-10-11 18:25:55 -07:00
Jim Miller
8a4408ccdf am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev 
* commit 'fdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54':
  Always show emergency button on selector view screen in keyguard.
 2012-10-11 18:22:51 -07:00
Jim Miller
fdb6be8b1f Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev 2012-10-11 18:21:13 -07:00
Christopher Tate
39944808b5 DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity 
Based on 3rd party developer observation, this is a source of much
confusion and layout mistakes.

Change-Id: I2cb6ae1540fe2444582403d9100478ebe02df985
 2012-10-11 18:14:23 -07:00