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

170742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calin Juravle
100a33bd38 am 37e232dc: am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit '37e232dc9cf867a81db92988f5f014ef573e3f97':
  Use native brige only if we have a private data directory.
 2014-10-30 23:59:30 +00:00
Calin Juravle
37e232dc9c am 21c3666e: am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev 
* commit '21c3666effbcc79737af2f80f930fa9deee1622e':
  Use native brige only if we have a private data directory.
 2014-10-30 23:42:30 +00:00
Calin Juravle
c147077480 am aab0c1af: resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp. 
* commit 'aab0c1af12c3a7495e0aa8b266a46e5e557323ce':
  PreInitializeNativeBridge only if its Available
 2014-10-30 23:42:15 +00:00
Calin Juravle
aab0c1af12 resolve merge conflicts of acbd002 to lmp-mr1-dev-plus-aosp. 
Change-Id: I50095f77a43c7e116bcedb1ad7cb7b45640cf1c7
 2014-10-30 23:27:54 +00:00
Scott Rowe
baa862666c Merge "docs: Training refactor for Android Studio Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612" 2014-10-30 20:40:57 +00:00
Scott Rowe
8c068aeee0 docs: Training refactor for Android Studio Cherrypick from lmp-docs hange-Id: I4c396b1a6b689a32b5a3328e9948f363ebb1e37d, from lmp-dev Change-Id: I830da649d9fac2b87eff5ee5cfc3422d5ab65ffc, Cherrypick from klp-modular-docs Change-Id: Ifaae51e4fa3afbef3d81d260135fd348a6ccb612 
Change-Id: I09a9473d73eb9c27ee6966b2a0e1cd736575db06
 2014-10-30 12:32:21 -07:00
John Spurlock
251c3840fa am 5612c757: am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev automerge: a410961 
* commit '5612c757df61f8f56064a77b71b57a207be763d3':
  PowerUI: Suppress warning on incremental drops.
 2014-10-30 19:24:42 +00:00
Jason Monk
c199a13162 am 5d06da83: am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev automerge: 736695d 
* commit '5d06da838649033c56dc2dedb77d6cdbd774eb87':
  QS: Only hide grid if there is detail to show
 2014-10-30 19:24:38 +00:00
Kenny Guy
b819e7b714 am a3497841: am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev automerge: 5cf65f7 
* commit 'a349784180f7e64a257e320799432ec12737895c':
  Listen for package changes for all users not just owner.
 2014-10-30 19:24:34 +00:00
Chris Wren
e9b498fb41 am e52d0d68: am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev automerge: b3239da 
* commit 'e52d0d68c4c192340ef48a2c750babfd48c090e3':
  Reveal notification listener settings APIs.
 2014-10-30 19:24:29 +00:00
John Spurlock
5612c757df am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev 
automerge: a410961

* commit 'a410961f79d845713ab2722788a40afca51f0eef':
  PowerUI: Suppress warning on incremental drops.
 2014-10-30 19:20:25 +00:00
John Reck
eaab65f49d am 97054254: am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev automerge: a27e1a3 
* commit '97054254d4c8eef66538814e1d5def776ceba97a':
  Be more conservative about current buffer
 2014-10-30 19:20:17 +00:00
Jorim Jaggi
f949f9e96e am ba541fd0: am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev automerge: 358aed4 
* commit 'ba541fd0c2bde5717586e5b0c80f6f0e24e95332':
  Improve doze transitions
 2014-10-30 19:20:13 +00:00
Geoff Mendal
29efa6b5df am c609f4db: (-s ours) am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: ef3d9bc -s ours 
* commit 'c609f4db3f08ef14db1612ac50af5e4e8aa1c580':
  Import translations. DO NOT MERGE
 2014-10-30 19:20:07 +00:00
Jorim Jaggi
4ce66f19b5 am fa61bfa4: am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev automerge: 6995604 
* commit 'fa61bfa429edacc2bacf0f9e427e39359d02dfec':
  Tune spacing in navigation bar for small and big devices
 2014-10-30 19:20:03 +00:00
Jason Monk
5d06da8386 am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev 
automerge: 736695d

* commit '736695dc3ef2abb5fdb66c0e026e84fdc68a245f':
  QS: Only hide grid if there is detail to show
 2014-10-30 19:19:26 +00:00
Kenny Guy
a349784180 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
automerge: 5cf65f7

* commit '5cf65f7bf6ca0751749bff3f8c89ff9f0a3dc9cb':
  Listen for package changes for all users not just owner.
 2014-10-30 19:18:27 +00:00
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
John Reck
97054254d4 am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
automerge: a27e1a3

* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
  Be more conservative about current buffer
 2014-10-30 19:16:14 +00:00
Jorim Jaggi
f35c187fc7 am 468e6b7e: am b9e290c7: Cancel ripple animations when window is hidden automerge: 987c680 
* commit '468e6b7e8b945385d229660a953b816355211d0c':
  Cancel ripple animations when window is hidden
 2014-10-30 19:15:54 +00:00
Calin Juravle
c482962401 am 298c170a: am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev automerge: 9917ebe 
* commit '298c170ae78d2c80f141e7cef15e42be3481549f':
  Fix the length of a profiler system property
 2014-10-30 19:15:49 +00:00
Erik Kline
c706f68d21 am 0d74973a: am befe778c: Treat optimistic addresses as global preferred. automerge: 9a8351d 
* commit '0d74973a08ebe4b7547100f7d60db07152cbbcd4':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:15:45 +00:00
Jinsuk Kim
ec571682e8 am 2dfb7397: am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev automerge: 44ce605 
* commit '2dfb7397b4c0f76c632ca7f229de4e234a425f99':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:15:40 +00:00
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
Jorim Jaggi
ba541fd0c2 am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev 
automerge: 358aed4

* commit '358aed4587c3c278bff61b90291d4e69ab6b5b04':
  Improve doze transitions
 2014-10-30 19:14:48 +00:00
Geoff Mendal
c609f4db3f am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: ef3d9bc  -s ours

* commit 'ef3d9bc8ac5208d8a8e30ae0a7e60a0dc461d2c4':
  Import translations. DO NOT MERGE
 2014-10-30 19:13:52 +00:00
Jorim Jaggi
fa61bfa429 am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev 
automerge: 6995604

* commit '699560479d76e3056e54bf3850ba301b6a0acf90':
  Tune spacing in navigation bar for small and big devices
 2014-10-30 19:12:58 +00:00
Jorim Jaggi
468e6b7e8b am b9e290c7: Cancel ripple animations when window is hidden 
automerge: 987c680

* commit '987c68090c8298f2d6a03ba01b703a5908ef16a2':
  Cancel ripple animations when window is hidden
 2014-10-30 19:11:56 +00:00
Calin Juravle
298c170ae7 am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev 
automerge: 9917ebe

* commit '9917ebed862ed8b687f5d17779c4e250fb5a30f6':
  Fix the length of a profiler system property
 2014-10-30 19:11:00 +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
Erik Kline
0d74973a08 am befe778c: Treat optimistic addresses as global preferred. 
automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:10:04 +00:00
Jinsuk Kim
2dfb7397b4 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:09:06 +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