Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
e0a3bcfbe1 am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit '0db8199664e9f501c4b2d1f8e404d762f68ae684':
  docs: Two-page notification fix.
 2014-10-30 15:44:55 +00:00
Ricardo Cervera
0db8199664 am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0acf536a00cc30ab8420e43321096afba601024':
  docs: Two-page notification fix.
 2014-10-30 15:38:35 +00:00
Ricardo Cervera
e0acf536a0 am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e3dd89a42a48c9ba461a0fff7859b7d0b205d146':
  docs: Two-page notification fix.
 2014-10-30 15:34:37 +00:00
Ricardo Cervera
e3dd89a42a Merge "docs: Two-page notification fix." into lmp-docs 2014-10-30 15:27:32 +00:00
Jorim Jaggi
196edbc9f6 am cdbdbe3a: Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 
* commit 'cdbdbe3a54f46cbe885fb2bb27d5e79297730bf0':
  Make status bar expanding more tightly coupled to finger
 2014-10-30 14:58:05 +00:00
Sander Alewijnse
112e053b9a Change javadoc of setAccountManagementDisabled. 
Method can also be called by device owner.

Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
 2014-10-30 14:54:28 +00:00
Sanket Padawe
305b15fe39 am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 
automerge: ef87aff

* commit 'ef87affff7056d600e137d098995064d698ec0ab':
  Remove checks to support new sim color selection.
 2014-10-30 14:52:14 +00:00
Jorim Jaggi
cdbdbe3a54 Merge "Make status bar expanding more tightly coupled to finger" into lmp-mr1-dev 2014-10-30 14:51:45 +00:00
Alan Viverette
1828679700 am 09da6ec6: am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 
automerge: 2a4c761

* commit '2a4c7618efc187ab2c2e4a337b4b6e6aeba687af':
  Update drag-to-open menu close behavior
 2014-10-30 14:51:10 +00:00
Jorim Jaggi
0b1528aac4 Make status bar expanding more tightly coupled to finger 
Improves the "direct modification" feeling a bit.

Bug: 17040206
Change-Id: Ide4bfb36aef584da36e0340bc2ed099e2e24c0ee
 2014-10-30 15:35:38 +01:00
Jorim Jaggi
37651a8baa am 2905cafc: Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 
* commit '2905cafcb898bccb1f52e77f3c2f7eb5fc9fe01f':
  Follow up to I495ce480c25de24b6433adebdfe923b637d98f66
 2014-10-30 14:30:58 +00:00
Jorim Jaggi
2905cafcb8 Merge "Follow up to I495ce480c25de24b6433adebdfe923b637d98f66" into lmp-mr1-dev 2014-10-30 14:25:51 +00:00
Lorenzo Colitti
1a9864db0a am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev 
* commit '2d2a69b2d3c03daa167fa1daba590a42dd3c3002':
  Enable 464xlat on wifi.
 2014-10-30 13:33:59 +00:00
Lorenzo Colitti
f2c9094293 am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'bbb2c5b28ad153afef40e27efbb8241988f33583':
  Add support for running 464xlat on wifi as well.
 2014-10-30 13:33:55 +00:00
Lorenzo Colitti
2d2a69b2d3 Merge "Enable 464xlat on wifi." into lmp-mr1-dev 2014-10-30 13:28:03 +00:00
Lorenzo Colitti
bbb2c5b28a Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 2014-10-30 13:27:54 +00:00
Lorenzo Colitti
dc6690867b Enable 464xlat on wifi. 
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
 2014-10-30 20:31:27 +09:00
Lorenzo Colitti
e21a26b3ba Add support for running 464xlat on wifi as well. 
1. Add a command to NetworkManagementService to enable/disable
   IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
   on a wifi network (which means it detected a NAT64), and
   correspondingly re-enable offload when the clatd interface
   goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
 2014-10-30 20:31:26 +09:00
Sanket Padawe
ef87affff7 am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev 
* commit '1ba2b168c0397e833272acbb4b7b8334e1789a6e':
  Remove checks to support new sim color selection.
 2014-10-30 11:03:41 +00:00
Alan Viverette
2a4c7618ef am 09da6ec6: am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 
* commit '09da6ec635fc4565aa7cdac62dccd40fcf73b359':
  Update drag-to-open menu close behavior
 2014-10-30 11:03:35 +00:00
Nicolas Prevot
3a1a0bbc32 Add a cross-profile intent filter only if it wasn't previously added. 
BUG: 17996284
Change-Id: I3d087767983928dfb13af9aedb37d29c9940ba36
 2014-10-30 11:02:37 +00:00
Nicolas Prevot
ad93adfb3d am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev 
* commit '9710b04f35efae696c9ee6343671eff3568f5678':
  Schedule to write package restrictions.
 2014-10-30 10:31:47 +00:00
Nicolas Prevot
9710b04f35 Merge "Schedule to write package restrictions." into lmp-mr1-dev 2014-10-30 10:28:20 +00:00
Yorke Lee
5884b92057 am 1dd9d241: am 3e29a313: am e398db4a: Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev 
* commit '1dd9d241c16ccee5e15d8c14b1251d4671cd5e2c':
  Add comment to TelecomManager.getCallState
 2014-10-30 10:26:43 +00:00
Adrian Roos
c9bfda6079 am f3aadaf5: am ca6e3879: am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit 'f3aadaf5ddf6df202d81031f0e76457c03b6149d':
  Close keyguard user switcher on tap outside
 2014-10-30 10:26:39 +00:00
John Spurlock
bf1f58dade am e89c714d: am e8c3c3f7: am 2896517b: Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev 
* commit 'e89c714dbaeec53ec6c1d2ec93cc615bc32386d2':
  Zen: Fix quantity format specifiers for quantity=1.
 2014-10-30 10:26:34 +00:00
Santos Cordon
548108d3f3 am a567b68b: am 3126b3e4: am ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 
* commit 'a567b68bbec5e60c65019ca0136e6b9a11c0cb88':
  Update javadocs for Telecom APIs.
 2014-10-30 10:26:30 +00:00
Jeff Davidson
863fbacd14 am ab3e142b: am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit 'ab3e142b302eef822d8daa7d4bf57994aad1a290':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:26:23 +00:00
Joe Fernandez
01088a84d0 am b51bd437: am 296e0a79: am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit 'b51bd437c2368c41b7ccf2b7ff96543e54162681':
  docs: Update timing of Android Wear app review
 2014-10-30 10:26:18 +00:00
David Friedman
744d5006d1 am 2a2200c6: am 387675d9: am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '2a2200c63c54ea627f2bc320f7dd06a92bc9cd1b':
  Updates Notifications screenshot for Android 5.0.
 2014-10-30 10:26:14 +00:00
Eric Gilmore
dfcc0c682e am ba6abdf8: am 7e99cedb: am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit 'ba6abdf841bd475e08e53a5008dd614a7943bfac':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-30 10:26:10 +00:00
Sebastien Hertz
c276b6189e am 837b140c: resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 
* commit '837b140c825c9f7342483ea9f39d4f872bcb2e3c':
  cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
 2014-10-30 10:21:12 +00:00
Yorke Lee
1dd9d241c1 am 3e29a313: am e398db4a: Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev 
* commit '3e29a3130aec59d388f438bf8de8885278e3ceb6':
  Add comment to TelecomManager.getCallState
 2014-10-30 10:18:56 +00:00
Adrian Roos
f3aadaf5dd am ca6e3879: am 579a7f99: Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev 
* commit 'ca6e38792d9b001dc404cfa83808aec88369c822':
  Close keyguard user switcher on tap outside
 2014-10-30 10:18:33 +00:00
John Spurlock
e89c714dba am e8c3c3f7: am 2896517b: Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev 
* commit 'e8c3c3f7069fd636d29bbbbebbf2790643081599':
  Zen: Fix quantity format specifiers for quantity=1.
 2014-10-30 10:18:24 +00:00
Santos Cordon
a567b68bbe am 3126b3e4: am ccbc3e5c: Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev 
* commit '3126b3e4835df82e54bf57b6e30a20c6922b0b81':
  Update javadocs for Telecom APIs.
 2014-10-30 10:18:18 +00:00
Jeff Davidson
ab3e142b30 am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit '306eac5f41de151a1be6832f6629113eef0b10e4':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:18:12 +00:00
Joe Fernandez
b51bd437c2 am 296e0a79: am 9513604c: am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs automerge: 56a8cb7 
* commit '296e0a79b988a5eb601ab60419b810d031fdf20b':
  docs: Update timing of Android Wear app review
 2014-10-30 10:18:05 +00:00
David Friedman
2a2200c63c am 387675d9: am 79c332a6: am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs automerge: b648cab 
* commit '387675d9050e699de4d976cfe78faec389673cb1':
  Updates Notifications screenshot for Android 5.0.
 2014-10-30 10:17:59 +00:00
Eric Gilmore
ba6abdf841 am 7e99cedb: am 3fc61015: am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service. automerge: 77760e7 
* commit '7e99cedb50bc0712cc879852e16793cfeeb0d85a':
  Docs: Adding Android Studio instructions for adding IAB service.
 2014-10-30 10:17:52 +00:00
Sebastien Hertz
837b140c82 resolved conflicts for merge of f44baef1 to lmp-mr1-dev-plus-aosp 
Change-Id: I754fa19727d0c1db7ca2110b7cae51c9f7c15e00
 2014-10-30 11:06:41 +01:00
Chris Banes
95e3322c93 am e436cb39: Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 
* commit 'e436cb39da5ebd57b0ca072ba39bfbe52b0a75e7':
  Fix ActionMenuView vertical alignment of items
 2014-10-30 08:58:41 +00:00
Chris Banes
e436cb39da Merge "Fix ActionMenuView vertical alignment of items" into lmp-mr1-dev 2014-10-30 08:42:37 +00:00
kmccormick
5298190a30 am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs 
automerge: 3e92c4a

* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
  Doc update: deliv receipt, rate exceeded, bug fixes.
 2014-10-30 05:23:58 +00:00
Dongwon Kang
c78d450b2e TIF: handle inputs holding the overlay view even after the session release 
automerge: ce34c6d

* commit 'ce34c6d308629c214ab9b7963755eb60cac03c9d':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-30 05:15:22 +00:00
Dongwon Kang
39567dd648 am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit 'c1f26faa2db2062ed42e422b038442fdb0aa3c68':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-30 04:42:39 +00:00
Dongwon Kang
ce34c6d308 TIF: handle inputs holding the overlay view even after the session release 
Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
 2014-10-30 13:37:03 +09:00
Dongwon Kang
c1f26faa2d Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 2014-10-30 04:32:30 +00:00
Elliott Hughes
8caccd4cb9 am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
automerge: 1b9813a

* commit '1b9813ad0bed9435fa4ec1631ddffc9ad5190d5f':
  Fix not to show a log with empty default ime
 2014-10-30 03:53:24 +00:00
Elliott Hughes
1b9813ad0b am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'b6e004261cc5c1b9b9ab338ce30896f537182336':
  Fix not to show a log with empty default ime
 2014-10-30 03:19:32 +00:00