157066 Commits

Author SHA1 Message Date
Jim Miller
a237a31484 Fix build
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
2014-11-06 18:05:59 -08:00
Andrew Lee
a70688f2a5 Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev 2014-11-07 01:54:01 +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
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
Jorim Jaggi
ae52c56448 Adjust owner info to spec
Bug: 18249205
Change-Id: I71916b977d7567d4bc998b86f0d7748ae73a5de0
2014-11-07 01:50:50 +01:00
Anthony Lee
30e6584249 Change access to removeConnection so we can override it.
Bug: 18056632
Bug: 18240234
Change-Id: I4e82051a27f3565e9a854df8b27c35300cdbe2ad
2014-11-06 16:47:20 -08:00
Brian Carlstrom
f4d2c8eebd Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev 2014-11-07 00:39:09 +00:00
Andre Eisenbach
44c11b9d2a am df11d588: Fix crash during Bluetooth on/off stress test
* commit 'df11d588bb26ad0e8b8a6e8551393a0abeec2fef':
  Fix crash during Bluetooth on/off stress test
2014-11-07 00:27:28 +00:00
Andre Eisenbach
df11d588bb Fix crash during Bluetooth on/off stress test
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit 178d3b54cd50558be789c5dfd8dad80ffdc65021)
2014-11-07 00:19:45 +00:00
Amit Mahajan
fc3f2380c9 Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 2014-11-07 00:17:43 +00:00
Luan Nguyen
df8daa8c13 am db212613: am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit 'db21261339f37666a23b5d1e7f8997af4439c0c2':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
2014-11-07 00:17:02 +00:00
Joe Fernandez
0171ad2bff am 5851fb9b: am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form
* commit '5851fb9b820eac653ff9010d49d96cb3df927203':
  docs: fix for Brand inquiries form
2014-11-07 00:16:58 +00:00
Luan Nguyen
db21261339 am 816b93cf: am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '816b93cf23c59a8a17e998ca706619b9eaa23793':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
2014-11-07 00:10:25 +00:00
Joe Fernandez
5851fb9b82 am d00ce6c5: am 1d295821: docs: fix for Brand inquiries form
* commit 'd00ce6c537242d8bf6f01122f7faebfc07652e87':
  docs: fix for Brand inquiries form
2014-11-07 00:10:21 +00:00
Andres Morales
3e5d6aa04b am f33d9db4: am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit 'f33d9db43a30299e2dfd3585c0964af953766a09':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
2014-11-07 00:06:25 +00:00
Jason Parks
220b65d21d am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
* commit '94c3e3bfcfe8d91283560082c737cb62e8d06742':
  Fix NPE for CTS.
2014-11-07 00:05:47 +00:00
Jeff Hao
c02d9a73e3 am 2a83226c: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
* commit '2a83226c7585895d08d3320a4bb881f3659ad0d9':
  Change boot screen title to "Android is starting" when not upgrading.
2014-11-07 00:05:43 +00:00
Rich Slogar
1d793503bd am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit 'd47ab00cc4f15287c8b48ed5805c4e9766facb58':
  docs:Remove tools/index.jd file.
2014-11-07 00:05:38 +00:00
Luan Nguyen
816b93cf23 am 712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
  cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
2014-11-07 00:05:20 +00:00
Joe Fernandez
d00ce6c537 am 1d295821: docs: fix for Brand inquiries form
* commit '1d295821355c6a1ffcb01866e38664343570129e':
  docs: fix for Brand inquiries form
2014-11-07 00:05:16 +00:00
ztenghui
7ae6fc81ef Merge "A better looking and faster spot shadow." into lmp-mr1-dev 2014-11-06 23:59:17 +00:00
Andres Morales
f33d9db43a am b1477d11: Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
* commit 'b1477d11ca873db761dd378a5fea93b26d695f78':
  [DO NOT MERGE] Increase min free levels for cached processes on 64bit
2014-11-06 23:57:25 +00:00
Andres Morales
b1477d11ca Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev 2014-11-06 23:51:00 +00:00
Yohei Yukawa
50ef3d93ad Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev 2014-11-06 23:45:23 +00:00
Andres Morales
423c44dc91 [DO NOT MERGE] Increase min free levels for cached processes on 64bit
Requires less memory pressure to start killing cached
processes.

Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
2014-11-06 15:44:02 -08:00
Luan Nguyen
712c7ea3d8 Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs 2014-11-06 23:26:53 +00:00
destradaa
992b9aa37b Merge "Add support for GPS measurement/navigation message capabilities. b/16727892 b/16815124" into lmp-mr1-dev 2014-11-06 23:22:46 +00:00
Alan Viverette
e763c9bd6e Clean up encapsulation in date picker classes
First step to replacing CalendarView with DayPickerView. Removes
dependencies on the DatePickerController class and adds setters
and listeners needed to hook up to DatePicker or CalendarView.

BUG: 18266649
Change-Id: Ic215f96eaddc0048040ec6bca0d85b776216fd26
2014-11-06 15:22:31 -08:00
ztenghui
d2dcd6fded A better looking and faster spot shadow.
1. This improve the looking, the star shape (spike) on long action bar is gone.
Shadow is more smooth now.

2. The performance is better, too. For averaging around rect, round rect and
circle, the spot shadow itself is 3 times faster. On N7 v1, it could be less than
0.1 ms.

b/14976551
b/16712006

Change-Id: I61ed546ee56e7c8dbe504dfcaef12d084904b4b8
2014-11-06 15:09:46 -08:00
Adam Lesinski
dcdfe9fef4 split-select: Fix rules generated for anydpi density
Change-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01
2014-11-06 14:57:34 -08:00
Joe Fernandez
1d29582135 docs: fix for Brand inquiries form
b/18162023

Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
2014-11-06 14:53:04 -08:00
Jason Parks
94c3e3bfcf Merge "Fix NPE for CTS." into lmp-sprout-dev 2014-11-06 22:23:04 +00:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169)
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
2014-11-06 14:02:35 -08:00
Craig Mautner
a11bb74271 Add logging for failure to finish.
Will help with bug 17648830.

Change-Id: Ib73c14cee332649a3e57a4779814a394f7d13173
2014-11-06 14:01:18 -08:00
Sreeram Ramachandran
0cb1bc488c Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev 2014-11-06 21:57:21 +00:00
destradaa
c3e5599cdc Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev 2014-11-06 21:50:40 +00:00
Alan Viverette
d6570d11e4 Support theme attributes in StateListDrawable <item> element
Also adds support for specifying drawable as a color since getDrawable()
automatically wraps colors to ColorDrawable. Does not currently allow
themed item elements to be used in Zygote preload, but we can add that
at some point in the future.

BUG: 18208662
Change-Id: I4c9721ffd100da4b9db7743a46c914828b943dae
2014-11-06 13:50:22 -08:00
RoboErik
b1d52e1d20 Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
* changes:
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
2014-11-06 21:20:19 +00:00
Sailesh Nepal
7d901cb6f5 Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev 2014-11-06 21:06:36 +00:00
George Mount
7ce5d75dc9 Only modify add Transition targets when they aren't targeted.
Bug 18191727

Transitions were targeting specific views, but they do this by
adding targets. If there was already a view targeted, now that
transition also targeted a different view. This prevents that
by only targeting views when no target was given.

Change-Id: I50590a81c1c1c55b1624f8df848ab53731f7e8e1
2014-11-06 13:01:16 -08:00
Jason Monk
5565cb42f2 Plumbing for screen pinning request from sysui
Removes lock-to-app request dialog from the AM.

Added a showScreenPinningRequest to IStatusBar to handle the
flow from app requesting lock task to showing the dialog.

This CL also allows startLockTaskOnCurrent (system|signature) to
start lock task directly.  (Note: this is the less locked version
that always allows exit through back + recents)

Bug: 16957435
Change-Id: I284918dd5989de6cb2767c2a717529eb5e9c6db4
2014-11-06 15:53:43 -05:00
Jeremy Joslin
1a2b99ea26 Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev 2014-11-06 20:51:24 +00:00
Amith Yamasani
775d104db2 Merge "Fix singleUser provider grants" into lmp-mr1-dev 2014-11-06 20:51:02 +00:00
Craig Mautner
7b1b0f63bc Merge "More fixes for keyguard animations." into lmp-mr1-dev 2014-11-06 20:49:36 +00:00
Jeff Hao
2a83226c75 Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev 2014-11-06 20:45:01 +00:00
Rich Slogar
d47ab00cc4 am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '830790baf8c35942832c5e7fb2467be6112048f4':
  docs:Remove tools/index.jd file.
2014-11-06 20:39:18 +00:00