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

94574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
c712079b5c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-29 15:10:10 -07:00
Baligh Uddin
c86c4ae693 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-29 15:09:02 -07:00
Amith Yamasani
91b231e0d6 am 7fd41276: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev 
* commit '7fd412767c063ccd2d80a3db6a0d27cf0ff6d261':
  Fix for some downloaded apps showing up on all users
 2012-10-29 15:05:07 -07:00
Baligh Uddin
f5a8e204db am 34a1e0dd: (-s ours) am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '34a1e0dda8d6f728e9c324e1e25e3844ec91e4b1':
  Import translations. DO NOT MERGE
 2012-10-29 15:05:06 -07:00
Amith Yamasani
7fd412767c am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev 
* commit '7c258505ecfbf726c56814963bee798e74ff4cb4':
  Fix for some downloaded apps showing up on all users
 2012-10-29 15:02:32 -07:00
Amith Yamasani
264df9b3db am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev 
* commit '7c258505ecfbf726c56814963bee798e74ff4cb4':
  Fix for some downloaded apps showing up on all users
 2012-10-29 15:02:24 -07:00
Baligh Uddin
aecee78916 Merge "Import translations. DO NOT MERGE" 2012-10-29 14:58:08 -07:00
Amith Yamasani
7c258505ec Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev 2012-10-29 14:57:53 -07:00
Baligh Uddin
3cbc6cd87d Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-29 14:55:21 -07:00
Baligh Uddin
34a1e0dda8 am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f64e70fd045c2a786e3d3edf880d806e93beec3b':
  Import translations. DO NOT MERGE
 2012-10-29 14:54:29 -07:00
Baligh Uddin
f7d69a9558 am f64e70fd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f64e70fd045c2a786e3d3edf880d806e93beec3b':
  Import translations. DO NOT MERGE
 2012-10-29 14:54:26 -07:00
Baligh Uddin
f64e70fd04 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-29 14:51:41 -07:00
Baligh Uddin
681c588aee am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4ee14e6392b728ab8843fc4a785b70d3ea2701a6':
  Import translations. DO NOT MERGE
 2012-10-29 14:50:30 -07:00
Baligh Uddin
4ee14e6392 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-29 14:47:53 -07:00
Victoria Lease
b4fd7cfe69 am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev 
* commit '629a90cf55cd6aa2e326dfdae2142e2b7e156731':
  FusedLocation runs per user as user
 2012-10-29 14:31:08 -07:00
Victoria Lease
9348d76098 am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev 
* commit '4f5561b71007f0b27f6bb385e7a7f4f67c88ed75':
  Revert "make FLP play nicely with multiuser"
 2012-10-29 14:31:05 -07:00
Irfan Sheriff
ec82f20d7a am b20dae4a: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev 
* commit 'b20dae4a8d63f28bbb6ae8c55f191cc52dd7dc47':
  Fix handling escaped chars in ssid
 2012-10-29 14:31:01 -07:00
Baligh Uddin
da64dc7a61 am ed6192f7: am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ed6192f7010b37e5252c9a409cb07ce75bb12d36':
  Import translations. DO NOT MERGE
 2012-10-29 14:30:57 -07:00
Baligh Uddin
bb242a7dd9 am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7ca0dc50ded270ea0a4d3b0b9ec1b5609a51465f':
  Import translations. DO NOT MERGE
 2012-10-29 14:30:57 -07:00
Jeff Brown
76bce54bc8 am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev 
* commit '9531b1c4889dfb30897eabd4db95364e1f316f44':
  Don't scale screen brightness by electron beam level.
 2012-10-29 14:23:56 -07:00
Dirk Dougherty
308aae45dc am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting. 
* commit 'f1d7dc730fc2fb8a9e5c913fb61df82b9d9104eb':
  Doc change: fix some table formatting.
 2012-10-29 14:23:52 -07:00
Eric Laurent
2aa46d3518 am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit '67baf8781bbf7cb70c0570ab3b3370265c9c7369':
  add settings for dock audio enabled
 2012-10-29 14:23:48 -07:00
Fabrice Di Meglio
d31f0ab93f am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev 
* commit '9d662c77650a1cee9d05ad93743684482eeba935':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
 2012-10-29 14:23:43 -07:00
Victoria Lease
5452d23247 am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit 'cee171409b4145876328f62823277e35387e66e4':
  make FLP play nicely with multiuser
 2012-10-29 14:23:38 -07:00
Adam Powell
f464bee41f am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout 
* commit 'daa7218a9ea4e0d48e4cecf96540e53f2e3d8945':
  Fix measurement bug in keyguard/MultiPaneChallengeLayout
 2012-10-29 14:23:29 -07:00
Adam Powell
c4f06ec48f am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev 
* commit '91885b5528ee1b8fec4db08a402eb90a36a84776':
  Keyguard - prevent slider intercept when we don't want it
 2012-10-29 14:23:24 -07:00
Winson Chung
e8e627dbdf am 69d0686f: am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev 
* commit '69d0686fdc20e95bd86079f6368acd4affb07b88':
  Making the PagedView full screen on tablets.
 2012-10-29 14:23:20 -07:00
Dianne Hackborn
0cc7b94eee am ffeb45a8: am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit 'ffeb45a8e579e328e30920426adb9d70c78346a4':
 2012-10-29 14:23:16 -07:00
Adam Cohen
14bc0bd5be am 40011d6f: am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev 
* commit '40011d6fef363e4cdc9c90ba3139e9199801c786':
  3D carousel initial stab -- paging outlines / alpha effects pending design
 2012-10-29 14:23:12 -07:00
Michael Jurka
769e5f0b30 am 18b5b1f4: am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev 
* commit '18b5b1f46298ad35398d8ba3dbd3156ad14296e6':
  Fix bug where it wasn't possible to add widgets
 2012-10-29 14:23:08 -07:00
Amith Yamasani
a4a15cf6f3 am de264c6d: am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit 'de264c6d18a7b68c0f2f7f1a27ab8c8b31e7f39d':
 2012-10-29 14:23:05 -07:00
Fabrice Di Meglio
dbf649b07c am bb0e7645: am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit 'bb0e76453b9a9a1947ac91a7af6cd6c657cbbe32':
 2012-10-29 14:23:01 -07:00
Jeff Brown
86772b3820 am b6fcfdb8: am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit 'b6fcfdb890b3460453708dbf38d5c20befa98383':
 2012-10-29 14:22:56 -07:00
Daniel Sandler
764d912075 am 7587e2a8: am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev 
* commit '7587e2a8455cdcd4a739877825cd0286347e0e28':
 2012-10-29 14:22:53 -07:00
Adam Powell
54e94487c7 am a5b74cc4: am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev 
* commit 'a5b74cc4c911d533a8c7784b4f0bbdf22cfee25f':
  Fix lockscreen slider bugs
 2012-10-29 14:22:48 -07:00
John Spurlock
46d9322fc7 am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev 
* commit 'e25974c347e29221bfaa9ce071797469f0bfc4f4':
  Implement "sticky" widget logic.
 2012-10-29 14:22:44 -07:00
Daniel Sandler
4ac6f4922b am 3d6438c8: am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev 
* commit '3d6438c89448341416a4da705d35338626d72c90':
  Make the add widget button hitrectangle smaller.
 2012-10-29 14:22:38 -07:00
Daniel Sandler
06c43b430e am cc3e894a: am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev 
* commit 'cc3e894a99e9479512f40c30ed0c782dcb021539':
  Remove the handle headroom if the challenge is open.
 2012-10-29 14:22:33 -07:00
Daniel Sandler
f684beb8ea am a84d353c: am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev 
* commit 'a84d353c772c3e2bdec4b2f36f6822ee62d117ed':
  Expand top of touchable area of challenge drag handle.
 2012-10-29 14:22:29 -07:00
John Spurlock
2123456ae2 am f04a6ee7: am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 
* commit 'f04a6ee7058a65cc1d2e24c5e572eb03b4914ed0':
  Update swipe edge size to match ux prototype.
 2012-10-29 14:22:25 -07:00
Dianne Hackborn
8729671cc0 am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit 'e1ea4d35d3abc05f2cd7bd961373ef164caf2a5b':
  Fix issue #7419050: Time is not getting updated after launching Clock
 2012-10-29 14:22:18 -07:00
Amith Yamasani
b67f91b672 am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '16f18a4ce879c53a06cffc552a5d25e73bed5327':
  Fix the user name for the owner.
 2012-10-29 14:22:11 -07:00
Fabrice Di Meglio
024e70c815 am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit 'dd80335edde688794db3260bcea7f732430abaf1':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
 2012-10-29 14:22:04 -07:00
Victoria Lease
629a90cf55 am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev 
* commit '83f60c5247ba60b6aa536b2d8191df9289102600':
  FusedLocation runs per user as user
 2012-10-29 14:12:28 -07:00
Victoria Lease
4f5561b710 am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev 
* commit '167282f19f58ba5271c37bb16c4ea5bcd0bf6303':
  Revert "make FLP play nicely with multiuser"
 2012-10-29 14:12:25 -07:00
Irfan Sheriff
b20dae4a8d am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev 
* commit '4bfa1e99e2ce5aa96465872a159377102a5bb4cb':
  Fix handling escaped chars in ssid
 2012-10-29 14:12:19 -07:00
Baligh Uddin
ed6192f701 am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'dbcec903c858b65c78620e2b06238e42ff4d12da':
  Import translations. DO NOT MERGE
 2012-10-29 14:12:04 -07:00
Baligh Uddin
7ca0dc50de am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2407ed15318453e5284153477453a94f19c324f4':
  Import translations. DO NOT MERGE
 2012-10-29 14:12:00 -07:00
Jeff Brown
9531b1c488 am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev 
* commit '99e88721a8bd19f04278e2fdccd224fc7ee705d4':
  Don't scale screen brightness by electron beam level.
 2012-10-29 14:11:56 -07:00
Dirk Dougherty
f1d7dc730f am 7b9a2889: Doc change: fix some table formatting. 
* commit '7b9a28892b1821a657bc9de5245528557d15a154':
  Doc change: fix some table formatting.
 2012-10-29 14:11:46 -07:00