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

166082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Selim Cinek
db885e22bd am a68da938: Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 
* commit 'a68da9382996132bb41d6f60b87a3bd5f8028b45':
  Fixed a bug with notification clipping
 2014-10-30 18:40:00 +00:00
Selim Cinek
a68da93829 Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 2014-10-30 18:33:14 +00:00
Alan Viverette
f7dee54b62 Only draw AbsListView selector when focused or pressed 
BUG: 18176135
Change-Id: Ibd9d9c0f439e5daa8eba606abc5ff055a3d8ff0c
 2014-10-30 11:26:29 -07:00
Guang Zhu
0620c451da also add backtraces of CPUs before watchdog kills system server 
Bug: 18003452
Change-Id: I052fe0b2948ea036c3f1b842ea6270b6f11eadef
 2014-10-30 18:25:05 +00:00
John Spurlock
a0adb0bd46 am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit 'fc2b9039b87afd3067f563a9bf59504a8bdf8a87':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-30 18:19:48 +00:00
Selim Cinek
c5baa3eb08 Fixed a bug with notification clipping 
The clip rect was not correctly set for a view which
was fading out leading to some overdraw.
It also fixes a bug where the alpha was not applied when
made invisible.

Bug: 16077953
Change-Id: I4c26aee88c5c87147df31ec7fb413bc63cd2625c
 2014-10-30 19:19:26 +01:00
John Spurlock
fc2b9039b8 Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 2014-10-30 18:12:23 +00:00
Hyejin Kim
5baaaac7c7 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: I7a0d55bc0da0566a60abb24123c1dbcdd03be9ed
 2014-10-30 17:49:54 +00:00
Alan Viverette
e9e7d012dd am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit '272e2f73bd825aa6b1db0a5b332effe8b84d7b8c':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-30 17:43:27 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS. 
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
 2014-10-30 13:42:05 -04:00
Alan Viverette
272e2f73bd Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 2014-10-30 17:38:40 +00:00
Alan Viverette
7f4a63d1eb Ensure we don't pass null values in to Theme.resolveAttributes 
BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
 2014-10-30 10:29:03 -07: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
Ricardo Cervera
44e79cc59a am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0a3bcfbe1637db8584b176a67447f152716036f':
  docs: Two-page notification fix.
 2014-10-30 15:50:31 +00:00
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