Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,672 Commits 3 Branches 0 Tags
077fa6cc1c4df9927ce4c8024221c8b6ec0d905c
Commit Graph

170672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Lee
077fa6cc1c am 9802c4c2: am 6727926a: Added a function to clear accounts for a specified package. automerge: fe5e5dc 
* commit '9802c4c206d284a58d71a96c9e2ebead0ae69d86':
  Added a function to clear accounts for a specified package.
 2014-10-30 19:15:36 +00:00
Lorenzo Colitti
5c313dccad am 2f3dab85: am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev automerge: ba69b3f 
* commit '2f3dab8585a1a11d2576a8b3164defe95191d513':
  Support more than one clatd at a time.
 2014-10-30 19:10:46 +00:00
Alan Viverette
c5b0309bf8 am 25128b0b: am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev automerge: b00c424 
* commit '25128b0b5a0472068ec73ac83082dc2e3429d144':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:10:41 +00:00
Shishir Agrawal
e6d4f45611 am 060afd45: am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev automerge: 47fa171 
* commit '060afd455fa8260c7ea262d0c1d2d555bc6771ea':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:10:37 +00:00
Ihab Awad
07de9295f1 am ac2b7f75: am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev automerge: 0ca329e 
* commit 'ac2b7f75cc701722c7d41c0f2f79b2b3fcb66e9a':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-30 19:10:32 +00:00
Anthony Lee
9802c4c206 am 6727926a: Added a function to clear accounts for a specified package. 
automerge: fe5e5dc

* commit 'fe5e5dc13a934581a05c740bfa104e078e94899d':
  Added a function to clear accounts for a specified package.
 2014-10-30 19:07:57 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Alan Viverette
25128b0b5a am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
automerge: b00c424

* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:05:27 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
Ihab Awad
ac2b7f75cc am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 
automerge: 0ca329e

* commit '0ca329e5d4ea9057337c30ca07ff5009ffc01a34':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-30 19:03:04 +00:00
Geoff Mendal
9e41639e92 am 8a44f0f0: (-s ours) am 07c45951: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '8a44f0f0be491f90714635a43b47ea7c3553e171':
  Import translations. DO NOT MERGE
 2014-10-30 18:39:30 +00:00
Geoff Mendal
b4d2cba5b2 am 990c7ced: (-s ours) am 6904eac7: (-s ours) Import translations. DO NOT MERGE 
* commit '990c7ced907339e27ea8c2a6aedd75abdd587fd3':
  Import translations. DO NOT MERGE
 2014-10-30 18:39:26 +00:00
Geoff Mendal
8a44f0f0be am 07c45951: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '07c45951be4ae801e3d7de016d9e98e12dbcda00':
  Import translations. DO NOT MERGE
 2014-10-30 16:59:25 +00:00
Geoff Mendal
990c7ced90 am 6904eac7: (-s ours) Import translations. DO NOT MERGE 
* commit '6904eac728cd94007c6d7787c56960c8cffcd4f1':
  Import translations. DO NOT MERGE
 2014-10-30 16:59:14 +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
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
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
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
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
Elliott Hughes
b6e004261c am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
  Fix not to show a log with empty default ime
 2014-10-30 03:06:12 +00:00
Elliott Hughes
c8dce8966b Merge "Fix not to show a log with empty default ime" 2014-10-30 03:02:01 +00:00
Hyejin Kim
e6ef68b15a Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
 2014-10-30 09:22:17 +09:00
Anthony Lee
fe5e5dc13a am 6727926a: Added a function to clear accounts for a specified package. 
* commit '6727926a9617cb715ee4fa407f547e67a6f7e134':
  Added a function to clear accounts for a specified package.
 2014-10-29 22:49:10 +00:00
Lorenzo Colitti
ba69b3f290 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
* commit 'def4cd4fa4aa035a5000e6b196130496430d65ff':
  Support more than one clatd at a time.
 2014-10-29 22:49:05 +00:00
Alan Viverette
b00c424257 am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
* commit '05b2fedcb8057f31ed078a59a8cffce131449df0':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-29 22:48:52 +00:00
Shishir Agrawal
47fa171522 am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
* commit 'c8787beca679ca593dda05bb151ebe4afdf441c8':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-29 22:48:43 +00:00
Ihab Awad
0ca329e5d4 am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 
* commit '6c37f374b5d86c798f799ac498b806d948c77f97':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-29 22:48:34 +00:00
Vladimir Marko
4e9176e6d5 am d9e8b73f: am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'd9e8b73fd03b2c1eda7c0cb195b39c6290de61ad':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:07:32 +00:00
Vladimir Marko
d9e8b73fd0 am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit '548101cb96fbc855d4257d46841b2959fe4c9ce4':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 22:03:18 +00:00
Vladimir Marko
548101cb96 am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type." 
* commit 'e5fe7f3f4069b176a0465617dceb630a52b710c0':
  Fix android_media_AudioSystem_getMasterMute return type.
 2014-10-29 21:57:16 +00:00
Vladimir Marko
e5fe7f3f40 Merge "Fix android_media_AudioSystem_getMasterMute return type." 2014-10-29 21:52:02 +00:00