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

91821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Patrick Brady
591d2bb3bd am d16dedf3: 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-m 
* commit 'd16dedf3055f69aceba74bfd0799a23a32f30344':
  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: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
Baligh Uddin
e3957d4402 am 069b87cf: (-s ours) am d344da78: am a1ecd5a3: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '069b87cf1f077a6329fdf6e0213d3f15ee4cc100':
  Import translations. DO NOT MERGE
 2012-10-12 11:10:04 -07:00
Baligh Uddin
aa27129f8d am 5fc1d865: (-s ours) am 44467c50: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '5fc1d8657265adfcd633ac849694d20666050fd9':
  Import translations. DO NOT MERGE
 2012-10-12 11:10:00 -07:00
Isaac Katzenelson
b701071828 am 381c7fd6: am 1586c96a: am 317beb1c: Merge "New alarm ringtones" into jb-mr1-dev 
* commit '381c7fd6aed72c296ee3d0ba42237d1d083c560f':
  New alarm ringtones
 2012-10-12 11:09:56 -07:00
Christopher Tate
00d396aa62 am c025df62: am d6790721: am a3f33309: Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev 
* commit 'c025df6276d4b3c830adbba7aed147c8e1c0ec55':
  DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
 2012-10-12 11:09:51 -07:00
John Reck
d35a870bd6 am e45ecba9: am be0786ae: am b746febc: Merge "Center text selection point to avoid rounding glitches" into jb-mr1-dev 
* commit 'e45ecba93be4fa5a2ccfd64224b0710dc8712999':
  Center text selection point to avoid rounding glitches
 2012-10-12 11:09:47 -07:00
Jim Miller
04522430d3 am 855cd776: am 8a4408cc: am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev 
* commit '855cd7763aff75387777701559dea91968321841':
  Always show emergency button on selector view screen in keyguard.
 2012-10-12 11:09:43 -07:00
Joe Malin
260d1f2748 am bbbb1298: am 289eb791: am 87afd6eb: am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide 
* commit 'bbbb1298e329d24ff6ee52ac82b65d8ceaa4dfc2':
  DOC CHANGE: Notifications Guide
 2012-10-12 11:09:35 -07:00
Stephen Hines
675453db60 am af23ed32: am 3e68d87d: am f8814489: Merge "Update compatibility library tests" into jb-mr1-dev 
* commit 'af23ed324ab174383b6c3db4cd9c47b1968b87b5':
  Update compatibility library tests
 2012-10-12 11:09:31 -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
Baligh Uddin
31fb344e03 Merge "Import translations. DO NOT MERGE" 2012-10-12 09:32:58 -07:00
Baligh Uddin
18ab87f820 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-12 09:26:41 -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
fb42a3fa81 Merge "Import translations. DO NOT MERGE" 2012-10-11 21:26: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
Baligh Uddin
648c2fb4dc Import translations. DO NOT MERGE 
Change-Id: Iebe92e1fc88cfbff79d6fb33df986cf5391b0955
Auto-generated-cl: translation import
 2012-10-11 18:46:11 -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
Baligh Uddin
4f0d1eb95c Import translations. DO NOT MERGE 
Change-Id: I5b3b3b1e25c3fc6406339c4980814ef9218eddbd
Auto-generated-cl: translation import
 2012-10-11 18:38:09 -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
John Reck
9fcef3d023 Center text selection point to avoid rounding glitches 
Bug: 7313424

Change-Id: I5356bec61e3d1244b506486300f059aa0bba6d9e
 2012-10-11 18:08:03 -07:00
Jeff Sharkey
d3ab7fc537 am 24251648: am 9ad36ded: am 9dfca201: Merge "Print newly generated userId." into jb-mr1-dev 
* commit '2425164835e9bbf4c501c69c078b2c1a48f3414e':
  Print newly generated userId.
 2012-10-11 17:55:15 -07:00
Jeff Sharkey
102dc1cb21 am 250a90ca: am 49db71e9: am 810df895: Merge "Return ApplicationInfo with requested userId." into jb-mr1-dev 
* commit '250a90cacf25fb277a5b778039965a330a0376d0':
  Return ApplicationInfo with requested userId.
 2012-10-11 17:55:11 -07:00
Jeff Brown
5f104da0a8 am 82c1b13e: am 1984e8c0: am 3da6c219: Merge "Do not launch Somnambulator as a dock app." into jb-mr1-dev 
* commit '82c1b13e8a2d2544bbab173becf215a6252d5454':
  Do not launch Somnambulator as a dock app.
 2012-10-11 17:55:07 -07:00
Svetoslav Ganov
7ae3f43f26 am ef5f50a4: am 407ce197: am 3003bada: Merge "Check whether ChromeVox is ready before attempting to call it." into jb-mr1-dev 
* commit 'ef5f50a4183b285cbde4c2a2cc4e44a25a564032':
  Check whether ChromeVox is ready before attempting to call it.
 2012-10-11 17:55:01 -07:00
Svetoslav Ganov
241856313f am 78c12209: am 50cf95fc: am 87c6f9a5: Merge "This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch." into jb-mr1-dev 
* commit '78c12209b6212dfc57d7e7d79d16d9efcb03217f':
  This is wrong since it fixed the symptom not the problem. Alan is uploading a correct patch.
 2012-10-11 17:54:55 -07:00