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

92183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
52b0c9f6dd am d1a04cb5: (-s ours) am c8e2b336: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'd1a04cb56748f3d9b3b16ccd52a4fc0672935e1a':
  Import translations. DO NOT MERGE
 2012-10-16 09:20:07 -07:00
Justin Ho
0365e85a67 am fd4ef4b1: am d2c9dcf7: am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 
* commit 'fd4ef4b1592795f2ae082528df4eb4c48c0564e9':
  Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
 2012-10-16 09:17:21 -07:00
Baligh Uddin
f37678a878 am b6b1f62a: (-s ours) am 10a77aa5: am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b6b1f62a42bf41c48d014615603208998d0f2ae4':
  Import translations. DO NOT MERGE
 2012-10-16 09:17:18 -07:00
Baligh Uddin
abcade56bf am a6966d56: (-s ours) am e485dc7e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a6966d56a817d57b1741d65a2c783144589e4c08':
  Import translations. DO NOT MERGE
 2012-10-16 09:17:14 -07:00
Baligh Uddin
d1a04cb567 am c8e2b336: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'c8e2b336cf90cbd29c4348f539ff4af8e23af1e5':
  Import translations. DO NOT MERGE
 2012-10-16 09:17:11 -07:00
Justin Ho
fd4ef4b159 am d2c9dcf7: am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 
* commit 'd2c9dcf75e14dc4eb18507ccfd956f2dc9312f25':
  Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
 2012-10-16 09:14:23 -07:00
Baligh Uddin
b6b1f62a42 am 10a77aa5: am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '10a77aa56ffa0257ddd19b0094e67be724db4c83':
  Import translations. DO NOT MERGE
 2012-10-16 09:14:20 -07:00
Baligh Uddin
a6966d56a8 am e485dc7e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e485dc7e5f687dc97e2b53bf9a4a40737423ce7d':
  Import translations. DO NOT MERGE
 2012-10-16 09:14:19 -07:00
Baligh Uddin
c8e2b336cf Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-16 09:14:05 -07:00
Justin Ho
d2c9dcf75e am 4add7431: Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 
* commit '4add743111cfd558c7b1c95b0b58b90a53e7556a':
  Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"
 2012-10-16 09:11:57 -07:00
Baligh Uddin
10a77aa56f am 75e861b6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '75e861b689ef8d099250f4dd558cdc1dfc3a7c1f':
  Import translations. DO NOT MERGE
 2012-10-16 09:11:53 -07:00
Baligh Uddin
62e546016e Merge "Import translations. DO NOT MERGE" 2012-10-16 09:10:38 -07:00
Justin Ho
4add743111 Merge "Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457"" into jb-mr1-dev 2012-10-16 09:08:22 -07:00
Baligh Uddin
75e861b689 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 09:08:22 -07:00
Justin Ho
c1188696b6 Revert "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" 
This reverts commit 04fe8723e48644bf5e1afc098f2117cbec6ba68d

Change-Id: I28ed23ad75ced96b66cc4dcce0faaf667c2d5d08
 2012-10-16 09:07:39 -07:00
Baligh Uddin
e485dc7e5f Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-16 09:06:20 -07:00
Justin Ho
5e7669d15f am 0d5bd804: am aa1805de: am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '0d5bd80451c914f075658397aaecc9b2f1f97b77':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 09:01:03 -07:00
Justin Ho
0d5bd80451 am aa1805de: am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit 'aa1805deeae6df16796d44d318bde8c612e56d13':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 08:58:22 -07:00
Justin Ho
aa1805deea am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '08876d19923e04f1a654264a075f87ff73334469':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 08:55:22 -07:00
Justin Ho
08876d1992 Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 2012-10-16 08:51:40 -07:00
Daniel Sandler
1d47c778ee am 1097addf: am 6d8b8e06: am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '1097addfd496fcc3b1dbfaf95b05ba8481df0967':
  Flipping quick settings!
 2012-10-16 07:50:51 -07:00
Daniel Sandler
1097addfd4 am 6d8b8e06: am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '6d8b8e06cd7f55483525727e156bed1fb7060478':
  Flipping quick settings!
 2012-10-16 07:48:06 -07:00
Daniel Sandler
6d8b8e06cd am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '18ea8f29909e7e80a8c5dc63b86678d89b7e5664':
  Flipping quick settings!
 2012-10-16 07:45:39 -07:00
Daniel Sandler
18ea8f2990 Merge "Flipping quick settings!" into jb-mr1-dev 2012-10-16 07:42:48 -07:00
Daniel Sandler
101784e560 Flipping quick settings! 
Bug: 7348917 ╰(°□°╰)
Change-Id: I16923d6d920913a4bd0d78666587ac579ac18da5
 2012-10-16 02:34:09 -04:00
Daniel Sandler
171786f439 am d0dee222: am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit 'd0dee22255eb45e6e3640fdf05d2cc2393045dca':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:30:47 -07:00
Daniel Sandler
d0dee22255 am 36074eec: am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '36074eecccaaa52e535513829b9de13ac3930347':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:28:24 -07:00
Daniel Sandler
36074eeccc am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '1f0752993ffd4339cdf0e7d69b96093503bd2e24':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:25:20 -07:00
Daniel Sandler
1f0752993f Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 2012-10-15 22:23:29 -07:00
Craig Mautner
858f0cce06 am 6404f11b: am 9018c0a9: am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev 
* commit '6404f11bd6da186e571e6070447a3934fb2743d4':
  Always layout Keyguard on config change.
 2012-10-15 22:13:37 -07:00
Craig Mautner
6404f11bd6 am 9018c0a9: am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev 
* commit '9018c0a96fa9d3e422fdef630be481d8ba96298a':
  Always layout Keyguard on config change.
 2012-10-15 22:11:12 -07:00
Craig Mautner
9018c0a96f am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev 
* commit 'f6dbd61b108e586c1db3e61cbfc07d4d750027c0':
  Always layout Keyguard on config change.
 2012-10-15 22:09:05 -07:00
Craig Mautner
f6dbd61b10 Merge "Always layout Keyguard on config change." into jb-mr1-dev 2012-10-15 22:05:55 -07:00
Mathias Agopian
d8c4f50981 am 1167b7b9: am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '1167b7b9e43878f077478f58e31e268c2e191110':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:53:21 -07:00
Mathias Agopian
1167b7b9e4 am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit 'dcfe6ceef05c1566a8fc80b758b830c39df01bbd':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:51:00 -07:00
Mathias Agopian
dcfe6ceef0 am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:47:56 -07:00
Mathias Agopian
6868d6f349 Revert "Revert "Fix for bug 6050753."" 
Emergency revert -- fix reboot loop.

This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.

Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
 2012-10-15 20:45:01 -07:00
Jamie Gennis
0d4f45d942 am b312f115: am 38041d6b: am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev 
* commit 'b312f1155caa1b323f482b92564cd07f3151c66b':
  Flag window animation transactions as animations.
 2012-10-15 20:23:09 -07:00
Romain Guy
dabcbfe46d am 3e6c9ba6: am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit '3e6c9ba6777cec3b3928ddb2b399c957735f7b06':
  Revert "Fix for bug 6050753."
 2012-10-15 20:23:05 -07:00
Romain Guy
1da111fca4 am e9d0c992: am 8ab33df5: am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev 
* commit 'e9d0c9920b98a7e3aca0a7583a55b8278166802a':
  Ensure we always request conformant OpenGL ES 2.0 contexts
 2012-10-15 20:23:00 -07:00
Romain Guy
9070bcbd17 am da7da3fb: am 4feddb27: am dec26f20: Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev 
* commit 'da7da3fb850c5b1ccb348b8202ead2a2eedb62c6':
  Add missing layout_width/height Bug #7334849
 2012-10-15 20:22:56 -07:00
Jeff Brown
4ffdf84bca am 19e2d23c: am d56d6702: am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev 
* commit '19e2d23cf4d547a9f09d0086dc88435c9a19e91c':
  Stop dreaming if the battery not charging effectively.
 2012-10-15 20:22:52 -07:00
Jeff Brown
31f36344bc am 09b37314: am 6593105c: am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev 
* commit '09b37314b6a95e4ecff867c74e85e196fcf08557':
  Cleanup some internal documentation.
 2012-10-15 20:22:44 -07:00
Jim Miller
139b929223 am a2afdfae: am bb2a0201: am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev 
* commit 'a2afdfaeccdf557321dc601baa06ea85711956ac':
  Fix inoperative "Forgot pattern" button when face unlock enabled
 2012-10-15 20:22:40 -07:00
Jeff Sharkey
0fa6bf683c am a1fda2e3: am 77ce60a5: am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev 
* commit 'a1fda2e388603152d45ea5ef43b1c9b6d6935b6b':
  Support pm clear as --user.
 2012-10-15 20:22:37 -07:00
Raph Levien
f95dfbbcfe am 244f5125: am b9e224cc: am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 
* commit '244f5125abd62e60f6bf91675f3be6d540b818d2':
  Fix for bug 7344916 text view flickers when you hit enter
 2012-10-15 20:22:33 -07:00
Jeff Brown
bf375dce9e am 006f6dfc: am 4eaba60f: am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev 
* commit '006f6dfc4cc1c2ad08e6bfad16d3463bca7a9933':
  Update wifi display device name when renamed.
 2012-10-15 20:22:25 -07:00
Svetoslav Ganov
4c870b69bf am 0b450a74: am 4a533efa: am 25160a6f: Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev 
* commit '0b450a749be2682503accb06cb7045be259257bf':
  Announce changes to the keyguard security message for accessibility.
 2012-10-15 20:22:22 -07:00
Jean-Michel Trivi
e4b3d9d2dd am 1c9a33c1: am 6bf84616: am 256ab9e9: Merge "Use device availability to start WFD audio routing" into jb-mr1-dev 
* commit '1c9a33c178faecc42e9a60c26d2ad60a49fdb4d2':
  Use device availability to start WFD audio routing
 2012-10-15 20:22:18 -07:00
Chris Craik
e98e1424df am 4bc446da: am 779ba3ad: am 2aa50b6b: Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev 
* commit '4bc446dae20c9945ad38c64e44797e41ccd7fd05':
  HW Acceleration support for stroked arcs with BUTT caps
 2012-10-15 20:22:14 -07:00