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

167359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e6f060fff0 am 8188fb92: (-s ours) am 714e1636: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8188fb92b3001f70d007a5b04dc0ddf526fc674f':
  Import translations. DO NOT MERGE
 2014-11-07 16:04:51 +00:00
Baligh Uddin
a7d7437c12 am f3a1007a: (-s ours) am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f3a1007af01d49db4af2d8152b781c55ee2f7bca':
  Import translations. DO NOT MERGE
 2014-11-07 16:02:40 +00:00
Baligh Uddin
864e24715b am b1ef8253: (-s ours) am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b1ef825367588db74ecb6bd4ce3360d98a651b61':
  Import translations. DO NOT MERGE
 2014-11-07 16:00:07 +00:00
Baligh Uddin
f3a1007af0 am 6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '6aaa61fd55955fd711199035fbd9771dcb8a9656':
  Import translations. DO NOT MERGE
 2014-11-07 15:58:15 +00:00
Baligh Uddin
59bde8429b am d8ed8060: (-s ours) am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd8ed806034764b855b78d3b696c3307e5e8d2ce4':
  Import translations. DO NOT MERGE
 2014-11-07 15:58:04 +00:00
Baligh Uddin
8188fb92b3 am 714e1636: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '714e16366381a14a5d8dd768c78b0afdc81af35c':
  Import translations. DO NOT MERGE
 2014-11-07 15:57:59 +00:00
Baligh Uddin
749868399b am a9ad9ce7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a9ad9ce71b77aa7b6d9dab3faccc4aa09ee06270':
  Import translations. DO NOT MERGE
 2014-11-07 15:53:31 +00:00
Baligh Uddin
ca14e15acd am c805d359: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c805d3599b44c961dcaf461ab7b9d1bf437b705b':
  Import translations. DO NOT MERGE
 2014-11-07 15:53:21 +00:00
Baligh Uddin
d8ed806034 am 63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '637176877e9358dc5badd140cd2b795701e7459c':
  Import translations. DO NOT MERGE
 2014-11-07 15:52:32 +00:00
Baligh Uddin
b1ef825367 am 326b2919: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '326b291988732765ea650c60b6c5efe74fb1b168':
  Import translations. DO NOT MERGE
 2014-11-07 15:52:19 +00:00
Baligh Uddin
714e163663 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:50:07 +00:00
Baligh Uddin
a9ad9ce71b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:49:33 +00:00
Baligh Uddin
6aaa61fd55 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:49:30 +00:00
Baligh Uddin
326b291988 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:45:43 +00:00
Baligh Uddin
c805d3599b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:45:39 +00:00
Baligh Uddin
637176877e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-07 15:45:37 +00:00
Ignacio Solla
ad87ec5bba am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'cf045ea8e4b91ac662d0aff74df429a2569d8e46':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:08:22 +00:00
Ignacio Solla
cf045ea8e4 am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit '803908b0db0139a2bc3eca2868cad67c9a274d97':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:01:08 +00:00
Baligh Uddin
ddfe33b690 Import translations. DO NOT MERGE 
Change-Id: Iae4fdd5608681f999b8b8234262b6da60d79eea2
Auto-generated-cl: translation import
 2014-11-07 01:50:28 -08:00
Baligh Uddin
ca372ca7f8 Import translations. DO NOT MERGE 
Change-Id: I3019f8f80cdeb209aa4f7903b149743af1b1473e
Auto-generated-cl: translation import
 2014-11-07 01:47:40 -08:00
Ignacio Solla
803908b0db Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 2014-11-07 09:44:59 +00:00
Baligh Uddin
31b3de0d95 Import translations. DO NOT MERGE 
Change-Id: Ic6355a1f0a89aadd602b3cfa6660f735f6d04d7b
Auto-generated-cl: translation import
 2014-11-07 01:44:33 -08:00
Baligh Uddin
e6ac0cd883 Import translations. DO NOT MERGE 
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
 2014-11-06 23:26:52 -08:00
Baligh Uddin
d3531b9880 Import translations. DO NOT MERGE 
Change-Id: I353eea105f85b0d45a2dd0f45b84921462c87c89
Auto-generated-cl: translation import
 2014-11-06 23:19:45 -08:00
Baligh Uddin
a8b1305363 Import translations. DO NOT MERGE 
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
 2014-11-06 23:11:55 -08:00
Quddus Chong
402a14047a am 63bafb39: am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '63bafb39bc64f671d686190985964f978a8cbd45':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 04:10:46 +00:00
Tyler Gunn
ab4650c456 Conference event package performance improvement. 
- Instead of sending each participant to the telephony conference
controller, all participants are sent at once.  This way the conference
only needs to be recalculated once.

Bug: 18057361
Change-Id: I86205fc7f1d2648bb180fc7eaf3ad611955952f9
 2014-11-06 20:06:23 -08:00
Quddus Chong
63bafb39bc am fedaef0d: am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit 'fedaef0d92e6760fbb8c02368ab74f5f4fe019cc':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 04:00:16 +00:00
Quddus Chong
fedaef0d92 am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f 
* commit '15127a69f6885f6fda2f60f9f2eafa2752d0f3e6':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:53:14 +00:00
Quddus Chong
15127a69f6 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
automerge: 0d7fa2f

* commit '0d7fa2fdd95a1e76373bfa8be31d8c50e96c5715':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 03:45:33 +00:00
Quddus Chong
0d7fa2fdd9 am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 
* commit '871aff9ca6654ee17e1cfb6d76b987dd3d552bba':
  docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
 2014-11-07 02:52:28 +00:00
Jim Miller
73d4368119 am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'eae9dc3b7fdf21c50de864d5ab13c71446c7b2da':
  Fix build
 2014-11-07 02:27:08 +00:00
Jim Miller
eae9dc3b7f am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'c6f5009fdb6aeafbee6db2b3e381f405ff23718b':
  Fix build
 2014-11-07 02:21:20 +00:00
Jim Miller
c6f5009fdb Merge "Fix build" into lmp-mr1-dev 2014-11-07 02:18:20 +00:00
Jim Miller
a237a31484 Fix build 
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
 2014-11-06 18:05:59 -08:00
Andrew Lee
a56fa73c30 am 8f34e65a: am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 
* commit '8f34e65afc020df064d0703633cb1f875bfc4fe8':
  Replace onConferenceChanged with onConnectionAdded.
 2014-11-07 02:04:30 +00:00
Andrew Lee
8f34e65afc am a70688f2: Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 
* commit 'a70688f2a5d2e90b3806709e32cb8de2057f5e39':
  Replace onConferenceChanged with onConnectionAdded.
 2014-11-07 01:58:35 +00:00
Andrew Lee
a70688f2a5 Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 2014-11-07 01:54:01 +00:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
d42e7b57de am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit 'c0542a96db6e2c59c00d9bfa030383eb82c1f41a':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 01:45:06 +00:00
Anthony Lee
55b1eb84d0 am 0b948550: am 30e65842: Change access to removeConnection so we can override it. 
* commit '0b9485502faa5837d3007992d3128a8d43a6247b':
  Change access to removeConnection so we can override it.
 2014-11-07 01:36:50 +00:00
Winson Chung
513aa79290 am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '3ed9f2f903a8e6c38ca9f2ce3819ac063281a020':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:33:28 +00:00
Winson Chung
c0542a96db am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit '7bd54c11223669e4b00a0d6cace0025f8116da5e':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 01:33:23 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Winson Chung
7bd54c1122 Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 2014-11-07 01:28:08 +00:00
Andrew Lee
46f7f5dce4 Replace onConferenceChanged with onConnectionAdded. 
This change is motivated by a desire to be able to adjust the
phone capabilities of a conference depending on its connections.

Turns out Connection is not a good place to do this, because when
the conference is set, this code is only fired if the connection
service already contains the conference. Conference makes more
sense to do this anyways, at the end of the day.

+ Add onConnectionAdded function to Conference.java.
- Remove onConferenceChanged function from Connection.java.

Bug: 18241753
Change-Id: Ib9212a8483a7a7b542618697399bbab8b2701b04
 2014-11-06 17:19:51 -08:00
Anthony Lee
0b9485502f am 30e65842: Change access to removeConnection so we can override it. 
* commit '30e65842493adc71aff649f32a45b6a38e83dc2e':
  Change access to removeConnection so we can override it.
 2014-11-07 01:17:29 +00:00
Quddus Chong
871aff9ca6 Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs 2014-11-07 01:11:33 +00:00
Winson Chung
2763095c13 Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581) 
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit 559e6d34b4e76ee21dc6e300681c399ed735a964)
 2014-11-07 01:10:03 +00:00
Winson Chung
7ae4b7e196 Fixing Recents crash when resetting focus of TaskView already returned to the pool. 
Change-Id: Iee789e4e726d5f035ec518f4fec444afecc2bbf2
 2014-11-06 17:07:52 -08:00