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

94142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
a6daf109b6 am 15f7136e: am 0c419856: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev 
* commit '15f7136e9b0b4ce1e512be7863b2e61e47d855f3':
  No playback and music widget from other user on user switch
 2012-10-30 10:10:57 -07:00
Baligh Uddin
16d95eca30 am 12b975d4: (-s ours) am c80f671a: am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '12b975d47bb879d37c42453306408f7548668de3':
  Import translations. DO NOT MERGE
 2012-10-30 10:10:47 -07:00
Baligh Uddin
f110814f92 am ded08eb1: (-s ours) am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'ded08eb19dd048ba46a6cb731391362300796d75':
  Import translations. DO NOT MERGE
 2012-10-30 10:10:40 -07:00
Amith Yamasani
9679cf72d8 am 91b231e0: am 7fd41276: am 7c258505: Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev 
* commit '91b231e0d63f1de6c93f9d54b34445c4356d360d':
  Fix for some downloaded apps showing up on all users
 2012-10-30 10:10:29 -07:00
Baligh Uddin
e08d1b3790 am f5a8e204: (-s ours) am 34a1e0dd: (-s ours) am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f5a8e204dbbf83a8c716977fe0855037862a1414':
  Import translations. DO NOT MERGE
 2012-10-30 10:10:23 -07:00
Baligh Uddin
0d0269ca95 am 681c588a: (-s ours) am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '681c588aee58bf702bfa2aa48a59bde2a64ee5ad':
  Import translations. DO NOT MERGE
 2012-10-30 10:10:18 -07:00
Victoria Lease
2bb40c91d2 am b4fd7cfe: am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev 
* commit 'b4fd7cfe69f50c3bf611c1d790c963109baf14df':
  FusedLocation runs per user as user
 2012-10-29 17:15:27 -07:00
Victoria Lease
edc739db01 am 9348d760: am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev 
* commit '9348d76098c941ecaf8b114dc98933e511e3f556':
  Revert "make FLP play nicely with multiuser"
 2012-10-29 17:15:23 -07:00
Irfan Sheriff
0878d96a87 am ec82f20d: am b20dae4a: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev 
* commit 'ec82f20d7a0e085cdadf63eddd6b2fa472867adb':
  Fix handling escaped chars in ssid
 2012-10-29 17:15:19 -07:00
Baligh Uddin
5a995ca7ab am da64dc7a: (-s ours) am ed6192f7: am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'da64dc7a619a0f8c7c7d2ef29c97788922926345':
  Import translations. DO NOT MERGE
 2012-10-29 17:15:15 -07:00
Baligh Uddin
474137518a am bb242a7d: (-s ours) am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bb242a7dd978460e34440f2b7b53d1a2051d7ae2':
  Import translations. DO NOT MERGE
 2012-10-29 17:15:11 -07:00
Jeff Brown
67f0211bfb am 76bce54b: am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev 
* commit '76bce54bc8c2cbe213c5aa914f45af9ac9022744':
  Don't scale screen brightness by electron beam level.
 2012-10-29 17:15:07 -07:00
Dirk Dougherty
2dc68703b2 am 308aae45: am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting. 
* commit '308aae45dc53b259e603c3436df63d67ce04dd4b':
  Doc change: fix some table formatting.
 2012-10-29 17:15:03 -07:00
Eric Laurent
9c95a173f7 am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
  add settings for dock audio enabled
 2012-10-29 17:14:59 -07:00
Fabrice Di Meglio
ea5e56ad9c am d31f0ab9: 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 'd31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
 2012-10-29 17:14:54 -07:00
Victoria Lease
8e32da8ef0 am 5452d232: am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit '5452d2324773ac1738a1c689eef102f005a8ef87':
  make FLP play nicely with multiuser
 2012-10-29 17:14:50 -07:00
Adam Powell
cc32e70aeb am f464bee4: am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout 
* commit 'f464bee41fa73e7d798bcec7274c20afa032e1bb':
  Fix measurement bug in keyguard/MultiPaneChallengeLayout
 2012-10-29 17:14:41 -07:00
Adam Powell
0e3a9e4f69 am c4f06ec4: am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev 
* commit 'c4f06ec48f2bfe2abf415eff01a236aed59e3706':
  Keyguard - prevent slider intercept when we don't want it
 2012-10-29 17:14:38 -07:00
Winson Chung
64593c9544 am e8e627db: am 69d0686f: am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev 
* commit 'e8e627dbdf0cce3528df1b239a7b215d65e63923':
  Making the PagedView full screen on tablets.
 2012-10-29 17:14:34 -07:00
Dianne Hackborn
5377e486fb am 0cc7b94e: am ffeb45a8: am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '0cc7b94eee16d72c90bdfdc787118038ee6b1314':
 2012-10-29 17:14:30 -07:00
Adam Cohen
ae40fe2ab1 am 14bc0bd5: am 40011d6f: am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev 
* commit '14bc0bd5bef1e92ecb57435133bb3b4b3db3fa10':
  3D carousel initial stab -- paging outlines / alpha effects pending design
 2012-10-29 17:14:26 -07:00
Michael Jurka
a9dced4297 am 769e5f0b: am 18b5b1f4: am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev 
* commit '769e5f0b30e263831fdbf8ba6f052124c137daa3':
  Fix bug where it wasn't possible to add widgets
 2012-10-29 17:14:22 -07:00
Amith Yamasani
cfd807f84a am a4a15cf6: am de264c6d: am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit 'a4a15cf6f3f26468b37f01981e9aa742883cc7aa':
 2012-10-29 17:14:18 -07:00
Fabrice Di Meglio
9145df9132 am dbf649b0: am bb0e7645: am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit 'dbf649b07cc7f848ac5b3f826aa2d819347e2f7b':
 2012-10-29 17:14:15 -07:00
Jeff Brown
242e71c2fc am 86772b38: am b6fcfdb8: am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '86772b38205a1b05f80d9d40577b4912ccf06c1c':
 2012-10-29 17:14:10 -07:00
Daniel Sandler
ef8832ca5a am 764d9120: am 7587e2a8: am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev 
* commit '764d912075296f9259ba1f05d621654cdc72ae21':
 2012-10-29 17:14:05 -07:00
Adam Powell
f20af07ad0 am 54e94487: am a5b74cc4: am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev 
* commit '54e94487c7eddbac1db1717a2faf4dfebd6da072':
  Fix lockscreen slider bugs
 2012-10-29 17:14:02 -07:00
John Spurlock
eda411dae5 am 46d9322f: am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev 
* commit '46d9322fc747990f73155f8635c595dc7ce916ac':
  Implement "sticky" widget logic.
 2012-10-29 17:13:56 -07:00
Daniel Sandler
0f52a47e36 am 4ac6f492: am 3d6438c8: am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev 
* commit '4ac6f4922b942ae5561ee882111e22f7cda0a6bb':
  Make the add widget button hitrectangle smaller.
 2012-10-29 17:13:52 -07:00
Daniel Sandler
ac424701d4 am 06c43b43: am cc3e894a: am 61426f3d: Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev 
* commit '06c43b430e9c97c6abe379dacfad298e5285f2f9':
  Remove the handle headroom if the challenge is open.
 2012-10-29 17:13:48 -07:00
Daniel Sandler
7da7d8750c am f684beb8: am a84d353c: am c9a7d989: Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev 
* commit 'f684beb8ea0603eb53c33f9cf5fecb664b0eb27c':
  Expand top of touchable area of challenge drag handle.
 2012-10-29 17:13:44 -07:00
John Spurlock
d700d30605 am 2123456a: am f04a6ee7: am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 
* commit '2123456ae2568684d3ee46d7107e4511ee9e5187':
  Update swipe edge size to match ux prototype.
 2012-10-29 17:13:40 -07:00
Dianne Hackborn
a5d75aec4e am 8729671c: am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '8729671cc0f99a5ca03cc7b6911b2bf98a19bef1':
  Fix issue #7419050: Time is not getting updated after launching Clock
 2012-10-29 17:13:36 -07:00
Amith Yamasani
b2c07cba32 am b67f91b6: am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit 'b67f91b672d898ae20a1e5848a37aadd33ab8167':
  Fix the user name for the owner.
 2012-10-29 17:13:29 -07:00
Fabrice Di Meglio
46e62fe398 am 024e70c8: am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit '024e70c8156a0fa2d702ff2fba4a38c1f6b68f98':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
 2012-10-29 17:13:23 -07:00
Victoria Lease
1ec7b68aae Merge "don't complain about CDMA support on non-CDMA devices" 2012-10-29 15:44:17 -07:00
Scott Main
b4e71578cb Merge "suggest LocationRequest rather than Criteria" 2012-10-29 15:34:02 -07:00
Jean-Michel Trivi
15f7136e9b am 0c419856: am 643e3372: Merge "No playback and music widget from other user on user switch" into jb-mr1-dev 
* commit '0c41985698f87ef15eb9b84f7727cc937307420b':
  No playback and music widget from other user on user switch
 2012-10-29 15:28:04 -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
Baligh Uddin
12b975d47b am c80f671a: am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c80f671a02c204947b0df569a17f8b2258383454':
  Import translations. DO NOT MERGE
 2012-10-29 15:22:54 -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
9ed5d0ef79 Merge "Import translations. DO NOT MERGE" 2012-10-29 15:14:02 -07:00
Baligh Uddin
ded08eb19d am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'c86c4ae693d13f467807cbd8c3aa2025045018c2':
  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
Victoria Lease
36a7748dfe suggest LocationRequest rather than Criteria 
LocationProvider's javadoc suggests using Criteria instead of
LocationProvider, which is deprecated. Criteria is deprecated, too,
now, so we suggest LocationRequest instead.

Bug: 7434865
Change-Id: Ieb5ef28ab1e6b4b3c4d2b8ceb3a601083b4f8e2f
 2012-10-29 15:10:37 -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
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