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

91726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e8d85f6d1f am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev 
* commit '56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
  Expose PreferenceManager constructor / Preference#performClick
 2012-10-29 13:37:17 -07:00
Jeff Brown
46a0ec73b6 am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:37:10 -07:00
Daniel Sandler
1b38ea484b am 6b2d4196: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev 
* commit '6b2d41966ad7970d0dd4a891fbf41641514df418':
  Final icon for (Day)dreams.
 2012-10-29 13:37:07 -07:00
Chris Wren
3f47cd2bf5 am 592f6343: am f0fd172a: lock out clicks while switching. 
* commit '592f6343726b61ad199236ccf6077941ad23aa74':
  lock out clicks while switching.
 2012-10-29 13:36:59 -07:00
John Spurlock
aa9aa440cb am ee12f5aa: am 47cde77b: Fix camera bugs found overnight. 
* commit 'ee12f5aa5701a0ace1bb61ea599cb024494b22cc':
  Fix camera bugs found overnight.
 2012-10-29 13:36:56 -07:00
Adam Powell
e7c8c76d4a am 300772e6: am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider 
* commit '300772e6f8c8d313457ea7eb0e7be4b670403f77':
  Integrate assets from UX; drag/bouncer animation behavior in slider
 2012-10-29 13:36:50 -07:00
Jim Miller
2d1c6770e5 am 3dd3a41a: am 9b1db682: Fix issue where security view sometimes doesn\'t show. 
* commit '3dd3a41aabfae3d5d27809b067da99568a516e22':
  Fix issue where security view sometimes doesn't show.
 2012-10-29 13:36:44 -07:00
Jim Miller
ebda6cb064 am c8896dab: am a71984f3: Cleanup keyguard signals 
* commit 'c8896dab510a3a758f651d92bfff8df0a4512670':
  Cleanup keyguard signals
 2012-10-29 13:36:40 -07:00
Michael Jurka
6dd6d43a8b am b1c5ec17: am 1254f2f4: Persist reordering/deleting widgets on keyguard 
* commit 'b1c5ec176d899b560f51e496b7719241d6ff8693':
  Persist reordering/deleting widgets on keyguard
 2012-10-29 13:36:36 -07:00
Robert Ly
6fbac90720 am 1de0549f: am 6a8d6da9: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs 
* commit '1de0549fd6361c399f2e6e4d0e2c8c83856b9909':
 2012-10-29 13:36:32 -07:00
Jim Miller
42321210d0 am 33e62a80: am f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev 
* commit '33e62a8061803ebf6cc2cfa697a3b8677ba8287f':
  Route signals from SlidingChalleng to SecurityView
 2012-10-29 13:36:28 -07:00
John Spurlock
4d30698780 am 33760695: am 7de482ba: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev 
* commit '3376069578f44aa81d7d30ceee72743a5d9b2158':
 2012-10-29 13:36:23 -07:00
Adam Powell
79cec380a3 am 0d980a3b: am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops 
* commit '0d980a3b298a233ed4bbb39955c47a95e51d53c8':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
 2012-10-29 13:36:19 -07:00
Chet Haase
c3ea37ef72 am c2b46a02: am b3975088: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 
* commit 'c2b46a02ee5e852c90450ad3154845782598d059':
 2012-10-29 13:36:15 -07:00
Daniel Sandler
0779157434 am 3e41588b: am d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev 
* commit '3e41588b931e40c692c39835f1b2f011822714cb':
  Fix Google Now on lockscreen.
 2012-10-29 13:36:11 -07:00
Fabrice Di Meglio
a4764e9f3a am 6278f804: am 654761a0: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 
* commit '6278f80463604c28db0e497ddd17e3182c06d51d':
 2012-10-29 13:36:07 -07:00
John Spurlock
cdf6c25d62 am eb4c0cb5: am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev 
* commit 'eb4c0cb5098bfceae762594621f4b5125ca7bbe4':
  Manual frameworks/base merge from lockhotness (camera).
 2012-10-29 13:36:03 -07:00
Svetoslav Ganov
a2f3f40731 am f78367e2: am e3b51ef0: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev 
* commit 'f78367e2d2dd1d25a2c474308a953149a9a35c60':
 2012-10-29 13:36:00 -07:00
Daniel Sandler
9c578ae93f am 25c0e692: am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev 
* commit '25c0e69287c479253b7520304ee4508aa05acc62':
  Haptics for PIN enter key
 2012-10-29 13:35:56 -07:00
Daniel Sandler
7a77f1f3a5 am b6890d34: am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev 
* commit 'b6890d341222b0d1d8a34b391fa1634d4cc353f7':
  Haptics for PIN keys.
 2012-10-29 13:35:53 -07:00
Bryan Mawhinney
c341ec1de5 am 033afa8c: am 661c2e74: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev 
* commit '033afa8c818a877e28fbf809a573929bdc460b90':
 2012-10-29 13:35:49 -07:00
Daniel Sandler
0608c84310 am 165303f6: am d5692742: PIN pad cosmetics. 
* commit '165303f6453e641b9ffe666d434c9ae581a8ab7e':
  PIN pad cosmetics.
 2012-10-29 13:35:46 -07:00