git.osdn.net Git - android-x86/frameworks-base.git/log

Adam Cohen [Tue, 30 Oct 2012 17:13:18 +0000 (10:13 -0700)]

am c19401a7: am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

* commit 'c19401a793869e9569b72f2c4c3fae9db9254c44':
Polish to 3d carousel and standard pager

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 17:13:14 +0000 (10:13 -0700)]

am 4092a505: am f68f41b4: am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit '4092a505f849abedac9537beeaa46ba8b3c8377b':

commit | commitdiff | tree

Chris Wren [Tue, 30 Oct 2012 17:13:10 +0000 (10:13 -0700)]

am b04d5c94: am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev

* commit 'b04d5c94e704708de90627b714f2d51ffc26d613':
single unlock target with honycomb semantics

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 17:13:06 +0000 (10:13 -0700)]

am 4f98fbe9: am 83372881: am fdbbbba4: Updated add-widget graphics

* commit '4f98fbe9a919a667dfd2607daefc7f87e7f70fab':
Updated add-widget graphics

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 17:11:57 +0000 (10:11 -0700)]

am 60b6ae23: am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit '60b6ae23f6a1ef41ea7976c7f6b70b26f13f96b6':
Move app-lib definition up for system app scanning

commit | commitdiff | tree

Mathias Agopian [Tue, 30 Oct 2012 17:11:23 +0000 (10:11 -0700)]

am ecd580d7: am fdd714f8: am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev

* commit 'ecd580d7dabfce40690a0e820087e169e7c30865':
fix an overflow in the orientation sensonr calculations

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 17:11:01 +0000 (10:11 -0700)]

am 88ae0ae4: am 40d076e6: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit '88ae0ae4848ce894612397957cf4de6a6a50a394':
audio service: make dock audio is off by default

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 30 Oct 2012 17:10:57 +0000 (10:10 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:47 +0000 (10:10 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:40 +0000 (10:10 -0700)]

am ded08eb1: (-s ours) am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'ded08eb19dd048ba46a6cb731391362300796d75':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 17:10:29 +0000 (10:10 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:23 +0000 (10:10 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 17:10:18 +0000 (10:10 -0700)]

am 681c588a: (-s ours) am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '681c588aee58bf702bfa2aa48a59bde2a64ee5ad':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 15:53:02 +0000 (08:53 -0700)]

am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

* commit '7fb0021d18a6491fdc816027081bff8c8d65f5aa':
Polish to 3d carousel and standard pager

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 15:52:59 +0000 (08:52 -0700)]

am f68f41b4: am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit 'f68f41b474ed35875a771ec71fb86887b629c58c':

commit | commitdiff | tree

Chris Wren [Tue, 30 Oct 2012 15:52:55 +0000 (08:52 -0700)]

am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev

* commit 'fe9356c074278f1a936fbd2d9eb00d9cf1914984':
single unlock target with honycomb semantics

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:52:52 +0000 (08:52 -0700)]

am 83372881: am fdbbbba4: Updated add-widget graphics

* commit '8337288183c9b5e145b44dbc8bae77f463edb4fc':
Updated add-widget graphics

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 15:48:48 +0000 (08:48 -0700)]

am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

* commit 'effc03a952a881108fcbb51d4007ea0c21694077':
Polish to 3d carousel and standard pager

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 15:48:44 +0000 (08:48 -0700)]

am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit 'e7cd58bd0323c02ebc51e48db11fe926ac4b9f9c':

commit | commitdiff | tree

Chris Wren [Tue, 30 Oct 2012 15:48:38 +0000 (08:48 -0700)]

am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev

* commit '1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
single unlock target with honycomb semantics

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 15:48:35 +0000 (08:48 -0700)]

am fdbbbba4: Updated add-widget graphics

* commit 'fdbbbba4cd4807bed1200f714609d4000501d4ee':
Updated add-widget graphics

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 00:21:28 +0000 (17:21 -0700)]

am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit 'b33588e1353076398b081a2ec4c79a04305e256e':
Move app-lib definition up for system app scanning

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 00:18:04 +0000 (17:18 -0700)]

am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
Move app-lib definition up for system app scanning

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 00:15:27 +0000 (17:15 -0700)]

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

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 00:15:23 +0000 (17:15 -0700)]

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"

commit | commitdiff | tree

Irfan Sheriff [Tue, 30 Oct 2012 00:15:19 +0000 (17:15 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 00:15:15 +0000 (17:15 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 30 Oct 2012 00:15:11 +0000 (17:15 -0700)]

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

commit | commitdiff | tree

Jeff Brown [Tue, 30 Oct 2012 00:15:07 +0000 (17:15 -0700)]

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.

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Oct 2012 00:15:03 +0000 (17:15 -0700)]

am 308aae45: am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting.

* commit '308aae45dc53b259e603c3436df63d67ce04dd4b':
Doc change: fix some table formatting.

commit | commitdiff | tree

Eric Laurent [Tue, 30 Oct 2012 00:14:59 +0000 (17:14 -0700)]

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 30 Oct 2012 00:14:54 +0000 (17:14 -0700)]

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)"

commit | commitdiff | tree

Kenny Root [Tue, 30 Oct 2012 00:14:50 +0000 (17:14 -0700)]

Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

commit | commitdiff | tree

Victoria Lease [Tue, 30 Oct 2012 00:14:50 +0000 (17:14 -0700)]

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

commit | commitdiff | tree

Adam Powell [Tue, 30 Oct 2012 00:14:41 +0000 (17:14 -0700)]

am f464bee4: am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout

* commit 'f464bee41fa73e7d798bcec7274c20afa032e1bb':
Fix measurement bug in keyguard/MultiPaneChallengeLayout

commit | commitdiff | tree

Adam Powell [Tue, 30 Oct 2012 00:14:38 +0000 (17:14 -0700)]

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

commit | commitdiff | tree

Winson Chung [Tue, 30 Oct 2012 00:14:34 +0000 (17:14 -0700)]

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.

commit | commitdiff | tree

Dianne Hackborn [Tue, 30 Oct 2012 00:14:30 +0000 (17:14 -0700)]

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':

commit | commitdiff | tree

Adam Cohen [Tue, 30 Oct 2012 00:14:26 +0000 (17:14 -0700)]

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

commit | commitdiff | tree

Michael Jurka [Tue, 30 Oct 2012 00:14:22 +0000 (17:14 -0700)]

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

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 00:14:18 +0000 (17:14 -0700)]

am a4a15cf6: am de264c6d: am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev

* commit 'a4a15cf6f3f26468b37f01981e9aa742883cc7aa':

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 30 Oct 2012 00:14:15 +0000 (17:14 -0700)]

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':

commit | commitdiff | tree

Jeff Brown [Tue, 30 Oct 2012 00:14:10 +0000 (17:14 -0700)]

am 86772b38: am b6fcfdb8: am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev

* commit '86772b38205a1b05f80d9d40577b4912ccf06c1c':

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 00:14:05 +0000 (17:14 -0700)]

am 764d9120: am 7587e2a8: am a41ca127: am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev

* commit '764d912075296f9259ba1f05d621654cdc72ae21':

commit | commitdiff | tree

Adam Powell [Tue, 30 Oct 2012 00:14:02 +0000 (17:14 -0700)]

am 54e94487: am a5b74cc4: am 942a60d8: Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev

* commit '54e94487c7eddbac1db1717a2faf4dfebd6da072':
Fix lockscreen slider bugs

commit | commitdiff | tree

John Spurlock [Tue, 30 Oct 2012 00:13:56 +0000 (17:13 -0700)]

am 46d9322f: am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev

* commit '46d9322fc747990f73155f8635c595dc7ce916ac':
Implement "sticky" widget logic.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 00:13:52 +0000 (17:13 -0700)]

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.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 00:13:48 +0000 (17:13 -0700)]

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.

commit | commitdiff | tree

Daniel Sandler [Tue, 30 Oct 2012 00:13:44 +0000 (17:13 -0700)]

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.

commit | commitdiff | tree

John Spurlock [Tue, 30 Oct 2012 00:13:40 +0000 (17:13 -0700)]

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.

commit | commitdiff | tree

Dianne Hackborn [Tue, 30 Oct 2012 00:13:36 +0000 (17:13 -0700)]

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

commit | commitdiff | tree

Amith Yamasani [Tue, 30 Oct 2012 00:13:29 +0000 (17:13 -0700)]

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.

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 30 Oct 2012 00:13:23 +0000 (17:13 -0700)]

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

commit | commitdiff | tree

Mathias Agopian [Mon, 29 Oct 2012 23:55:40 +0000 (16:55 -0700)]

am fdd714f8: am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev

* commit 'fdd714f8d52a7ab2b96839b7cfe8ed917417383b':
fix an overflow in the orientation sensonr calculations

commit | commitdiff | tree

Mathias Agopian [Mon, 29 Oct 2012 23:52:41 +0000 (16:52 -0700)]

am 0da554ac: Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev

* commit '0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf':
fix an overflow in the orientation sensonr calculations

commit | commitdiff | tree

Mathias Agopian [Mon, 29 Oct 2012 23:49:48 +0000 (16:49 -0700)]

Merge "fix an overflow in the orientation sensonr calculations" into jb-mr1-dev

commit | commitdiff | tree

Mathias Agopian [Mon, 29 Oct 2012 23:03:46 +0000 (16:03 -0700)]

fix an overflow in the orientation sensonr calculations

this would cause the TYPE_ORIENTATION sensor to report NaN after
40 to 800 hours of up-time. this problem only affects the older
and deprecated SensorListener API.

Bug: 7434842
Change-Id: Ie8593cca9c98e4907e417db4106c06151e3ee9a1

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 22:44:17 +0000 (15:44 -0700)]

Merge "don't complain about CDMA support on non-CDMA devices"

commit | commitdiff | tree

Scott Main [Mon, 29 Oct 2012 22:33:51 +0000 (15:33 -0700)]

Merge "suggest LocationRequest rather than Criteria"

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 22:28:08 +0000 (15:28 -0700)]

am 40d076e6: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit '40d076e61748ba304f754501ddaad63a0255bf96':
audio service: make dock audio is off by default

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 29 Oct 2012 22:28:04 +0000 (15:28 -0700)]

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

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 22:25:29 +0000 (15:25 -0700)]

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

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 29 Oct 2012 22:25:24 +0000 (15:25 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:22:54 +0000 (15:22 -0700)]

am c80f671a: am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'c80f671a02c204947b0df569a17f8b2258383454':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 22:21:33 +0000 (15:21 -0700)]

Merge "audio service: make dock audio is off by default" into jb-mr1-dev

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 29 Oct 2012 22:16:13 +0000 (15:16 -0700)]

Merge "No playback and music widget from other user on user switch" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:13:51 +0000 (15:13 -0700)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:12:28 +0000 (15:12 -0700)]

am c86c4ae6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'c86c4ae693d13f467807cbd8c3aa2025045018c2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:12:25 +0000 (15:12 -0700)]

am c712079b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'c712079b5c3c34b7a38b8cd0bfc974f8832c1ab0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 22:07:50 +0000 (15:07 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:10:09 +0000 (15:10 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:08:52 +0000 (15:08 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 22:05:07 +0000 (15:05 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 22:05:06 +0000 (15:05 -0700)]

am 34a1e0dd: (-s ours) am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '34a1e0dda8d6f728e9c324e1e25e3844ec91e4b1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 22:02:32 +0000 (15:02 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:58:08 +0000 (14:58 -0700)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 21:57:20 +0000 (14:57 -0700)]

Merge "Fix for some downloaded apps showing up on all users" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:54:29 +0000 (14:54 -0700)]

am f64e70fd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f64e70fd045c2a786e3d3edf880d806e93beec3b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:51:40 +0000 (14:51 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:50:30 +0000 (14:50 -0700)]

am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '4ee14e6392b728ab8843fc4a785b70d3ea2701a6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:47:41 +0000 (14:47 -0700)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:31:08 +0000 (14:31 -0700)]

am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '629a90cf55cd6aa2e326dfdae2142e2b7e156731':
FusedLocation runs per user as user

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:31:05 +0000 (14:31 -0700)]

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"

commit | commitdiff | tree

Irfan Sheriff [Mon, 29 Oct 2012 21:31:01 +0000 (14:31 -0700)]

am b20dae4a: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

* commit 'b20dae4a8d63f28bbb6ae8c55f191cc52dd7dc47':
Fix handling escaped chars in ssid

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:30:57 +0000 (14:30 -0700)]

am ed6192f7: am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'ed6192f7010b37e5252c9a409cb07ce75bb12d36':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 29 Oct 2012 21:30:57 +0000 (14:30 -0700)]

am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '7ca0dc50ded270ea0a4d3b0b9ec1b5609a51465f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 21:23:56 +0000 (14:23 -0700)]

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.

commit | commitdiff | tree

Dirk Dougherty [Mon, 29 Oct 2012 21:23:52 +0000 (14:23 -0700)]

am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting.

* commit 'f1d7dc730fc2fb8a9e5c913fb61df82b9d9104eb':
Doc change: fix some table formatting.

commit | commitdiff | tree

Eric Laurent [Mon, 29 Oct 2012 21:23:48 +0000 (14:23 -0700)]

am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit '67baf8781bbf7cb70c0570ab3b3370265c9c7369':
add settings for dock audio enabled

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:23:43 +0000 (14:23 -0700)]

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)"

commit | commitdiff | tree

Victoria Lease [Mon, 29 Oct 2012 21:23:38 +0000 (14:23 -0700)]

am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev

* commit 'cee171409b4145876328f62823277e35387e66e4':
make FLP play nicely with multiuser

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:23:29 +0000 (14:23 -0700)]

am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout

* commit 'daa7218a9ea4e0d48e4cecf96540e53f2e3d8945':
Fix measurement bug in keyguard/MultiPaneChallengeLayout

commit | commitdiff | tree

Adam Powell [Mon, 29 Oct 2012 21:23:24 +0000 (14:23 -0700)]

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

commit | commitdiff | tree

Winson Chung [Mon, 29 Oct 2012 21:23:20 +0000 (14:23 -0700)]

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.

commit | commitdiff | tree

Dianne Hackborn [Mon, 29 Oct 2012 21:23:16 +0000 (14:23 -0700)]

am ffeb45a8: am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev

* commit 'ffeb45a8e579e328e30920426adb9d70c78346a4':

commit | commitdiff | tree

Adam Cohen [Mon, 29 Oct 2012 21:23:12 +0000 (14:23 -0700)]

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

commit | commitdiff | tree

Michael Jurka [Mon, 29 Oct 2012 21:23:08 +0000 (14:23 -0700)]

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

commit | commitdiff | tree

Amith Yamasani [Mon, 29 Oct 2012 21:23:05 +0000 (14:23 -0700)]

am de264c6d: am 369f1c92: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev

* commit 'de264c6d18a7b68c0f2f7f1a27ab8c8b31e7f39d':

commit | commitdiff | tree

Fabrice Di Meglio [Mon, 29 Oct 2012 21:23:01 +0000 (14:23 -0700)]

am bb0e7645: am b8a220cb: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev

* commit 'bb0e76453b9a9a1947ac91a7af6cd6c657cbbe32':

commit | commitdiff | tree

Jeff Brown [Mon, 29 Oct 2012 21:22:56 +0000 (14:22 -0700)]

am b6fcfdb8: am d3d523da: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev

* commit 'b6fcfdb890b3460453708dbf38d5c20befa98383':