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

88988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
40d076e617 am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev 
* commit '61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
  audio service: make dock audio is off by default
 2012-10-29 15:25:29 -07:00
Jean-Michel Trivi
0c41985698 am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev 
* commit '643e33725866f76402ae147f5b585f7dafdc6d17':
  No playback and music widget from other user on user switch
 2012-10-29 15:25:24 -07:00
Eric Laurent
c864d952bc am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev 
* commit '61ebf9cd8f0b7bfbad6840bb828f2300beef745d':
  audio service: make dock audio is off by default
 2012-10-29 15:24:14 -07:00
Eric Laurent
61ebf9cd8f Merge "audio service: make dock audio is off by default" into jb-mr1-dev 2012-10-29 15:21:33 -07:00
Jean-Michel Trivi
f1c62be6b4 am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev 
* commit '643e33725866f76402ae147f5b585f7dafdc6d17':
  No playback and music widget from other user on user switch
 2012-10-29 15:19:59 -07:00
Jean-Michel Trivi
643e337258 Merge "No playback and music widget from other user on user switch" into jb-mr1-dev 2012-10-29 15:16:37 -07:00
Baligh Uddin
b560cfb3b6 am c712079b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
  Import translations. DO NOT MERGE
 2012-10-29 15:12:28 -07:00
Baligh Uddin
c80f671a02 am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
  Import translations. DO NOT MERGE
 2012-10-29 15:12:25 -07:00
Baligh Uddin
be7a814e0e Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-29 15:11:00 -07:00
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
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
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
4ee14e6392 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-29 14:47:53 -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
Eric Laurent
67baf8781b am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit 'c99a1107c0d4fdf47595e5072192d647a01e13b3':
  add settings for dock audio enabled
 2012-10-29 14:02:31 -07:00
Fabrice Di Meglio
9d662c7765 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 '68b14054b96571d4009c6c5a9b4c3413d908a523':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
 2012-10-29 14:01:51 -07:00
Victoria Lease
cee171409b am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit '319c7e85019350e3a5f26c64803900b945130c3b':
  make FLP play nicely with multiuser
 2012-10-29 14:01:47 -07:00
Adam Powell
daa7218a9e am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout 
* commit '0a27c4865e5f3afe891680f687ac75c6a659fb84':
  Fix measurement bug in keyguard/MultiPaneChallengeLayout
 2012-10-29 14:01:44 -07:00
Adam Powell
91885b5528 am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev 
* commit 'b0ed8bdb41cff76f31ce47f1ae7ee51ea68bba47':
  Keyguard - prevent slider intercept when we don't want it
 2012-10-29 14:01:36 -07:00
Winson Chung
69d0686fdc am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev 
* commit '113ca64a2275ad05c1429edcf56c688d823e308a':
  Making the PagedView full screen on tablets.
 2012-10-29 14:01:32 -07:00
Dianne Hackborn
ffeb45a8e5 am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '8905923c63b73deecb82567f16404b2cf90de8cc':
 2012-10-29 14:01:26 -07:00
Adam Cohen
40011d6fef am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev 
* commit '8daee807532861239740a31689255fddf11574c1':
  3D carousel initial stab -- paging outlines / alpha effects pending design
 2012-10-29 14:01:20 -07:00
Michael Jurka
18b5b1f462 am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev 
* commit 'a15eeacff99650cb9151106438fb61b73d4e749a':
  Fix bug where it wasn't possible to add widgets
 2012-10-29 14:01:10 -07:00
Amith Yamasani
de264c6d18 am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '369f1c92e7cc1fba13b04698fb310fded1a85eda':
 2012-10-29 14:01:07 -07:00
Fabrice Di Meglio
bb0e76453b am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit 'b8a220cbef4bc6a3af327fce51d59aacd91a9935':
 2012-10-29 14:01:03 -07:00
Jeff Brown
b6fcfdb890 am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit 'd3d523da9a9906beb78c1fd9fa90dac7ea10e5ad':
 2012-10-29 14:01:00 -07:00
Daniel Sandler
7587e2a845 am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev 
* commit 'a41ca127a6bb81ce4f660bda25d62105fba6de3a':
 2012-10-29 14:00:56 -07:00
Adam Powell
a5b74cc4c9 am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev 
* commit '942a60d8a40a55b94ce443a71e7dc632911f0e84':
  Fix lockscreen slider bugs
 2012-10-29 14:00:53 -07:00
John Spurlock
e25974c347 am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev 
* commit '011717d0648878eedec9e6de90b8fba12f550df7':
  Implement "sticky" widget logic.
 2012-10-29 14:00:48 -07:00
Daniel Sandler
3d6438c894 am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev 
* commit '1f887cb2928695c81df9cfbbb730225ee81051dd':
  Make the add widget button hitrectangle smaller.
 2012-10-29 14:00:43 -07:00
Daniel Sandler
cc3e894a99 am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev 
* commit '61426f3d83f329ae76a226ea614541db9eb16bcb':
  Remove the handle headroom if the challenge is open.
 2012-10-29 14:00:39 -07:00
Daniel Sandler
a84d353c77 am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev 
* commit 'c9a7d9899908a3f5960cfe6123d51cfbfcf2b0ae':
  Expand top of touchable area of challenge drag handle.
 2012-10-29 14:00:36 -07:00
John Spurlock
f04a6ee705 am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 
* commit 'af5b49c12dc2ff83b3d43663f4fda09401fb7d3f':
  Update swipe edge size to match ux prototype.
 2012-10-29 14:00:32 -07:00
Dianne Hackborn
e1ea4d35d3 am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '8a6f6a8ca9824891cc841d8c6ebd72a74c7d2580':
  Fix issue #7419050: Time is not getting updated after launching Clock
 2012-10-29 13:56:01 -07:00
Amith Yamasani
16f18a4ce8 am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '084824548f9706db8356ed4480c282288ffc0bd0':
  Fix the user name for the owner.
 2012-10-29 13:55:57 -07:00
Fabrice Di Meglio
dd80335edd am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
 2012-10-29 13:55:46 -07:00
Justin Koh
56d9696bb7 Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev 2012-10-29 13:33:01 -07:00
Jeff Brown
14012e1d1b am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:32:02 -07:00