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

171080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3488549f75 am b2c607db: (-s ours) am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b2c607dbb876d2d32565e3183f472ea278a609ec':
  Import translations. DO NOT MERGE
 2014-10-30 23:42:35 +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
Alan Viverette
19745dc0f1 am 0c189ca5: Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 
* commit '0c189ca5c4ee8a61c89d437ff22fd2628b353765':
  Only draw AbsListView selector when focused or pressed
 2014-10-30 23:30:33 +00:00
George Mount
cfff54270b am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 
* commit '57928195a89971e89273c4ef06397d78b0bd0233':
  Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
 2014-10-30 23:30:28 +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
Alan Viverette
0c189ca5c4 Merge "Only draw AbsListView selector when focused or pressed" into lmp-mr1-dev 2014-10-30 23:15:13 +00:00
George Mount
57928195a8 Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev 2014-10-30 23:11:53 +00:00
Alan Viverette
e1f9f23110 am 685a8770: Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 
* commit '685a8770c018d02080d29f18fcb9e50a182912aa':
  Fix inset check in ThreadedRenderer
 2014-10-30 22:34:44 +00:00
Alan Viverette
685a8770c0 Merge "Fix inset check in ThreadedRenderer" into lmp-mr1-dev 2014-10-30 22:30:21 +00:00
Craig Mautner
3bfd2b7b8f am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '159da3dba8811017c683fcee26c795be1948b0c4':
  Add enter-animation-done callback for system windows
 2014-10-30 22:15:57 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows 
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
 2014-10-30 14:43:18 -07:00
Tyler Gunn
4a57b9b59b Creating connections for conference event package participants. 
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.

Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
 2014-10-30 14:27:48 -07:00
Alan Viverette
d93421b143 am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 
* commit 'afffc5c29adafc6a4c0b33834b2e016be02ee7bd':
  Remove scroll view from correct parent in AlertController
 2014-10-30 21:13:17 +00:00
Alan Viverette
afffc5c29a Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev 2014-10-30 21:09:19 +00:00
Guang Zhu
3a68e1811f am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 
* commit '4ba4e03e6b8dcb556774b323429f8904676cd615':
  also add backtraces of CPUs before watchdog kills system server
 2014-10-30 21:00:34 +00:00
Guang Zhu
4ba4e03e6b Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 2014-10-30 20:56:40 +00:00
Alan Viverette
35c3cb6a59 Remove scroll view from correct parent in AlertController 
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
 2014-10-30 13:51:21 -07: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
Santos Cordon
52e34e6a62 am c1c86151: Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 
* commit 'c1c86151b033a2c866c10970553b567dfb359ba9':
  More updates to javadocs for Telecom APIs.
 2014-10-30 20:05:30 +00:00
Santos Cordon
c1c86151b0 Merge "More updates to javadocs for Telecom APIs." into lmp-mr1-dev 2014-10-30 20:01:40 +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
Santos Cordon
3ae9505f67 am 9acb9598: Merge "Even more javadocs for telecom." into lmp-mr1-dev 
* commit '9acb9598b7bd18003ee3abe656818972dad03a29':
  Even more javadocs for telecom.
 2014-10-30 19:29:07 +00:00
Santos Cordon
9acb9598b7 Merge "Even more javadocs for telecom." into lmp-mr1-dev 2014-10-30 19:25:40 +00: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
Alan Viverette
3aa1ffbc75 Fix inset check in ThreadedRenderer 
BUG: 17729606
Change-Id: I9303a788968b424fd8ca27fe4bb99bab51ec34a7
 2014-10-30 12:22:08 -07:00
George Mount
ca5094a05c Fix NPE when snapshot ImageView uses ScaleType.MATRIX. 
Bug 18170774

Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
 2014-10-30 12:21:00 -07: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