OSDN Git Service
John Spurlock [Fri, 7 Nov 2014 20:31:10 +0000 (20:31 +0000)]
Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev
John Spurlock [Fri, 7 Nov 2014 04:06:25 +0000 (23:06 -0500)]
QS: Long-press on usage-based tiles to hide.
Bug:
18284167
Change-Id: Ia03ea34af5733b801be6a14645c76754b73c6165
John Spurlock [Fri, 7 Nov 2014 20:26:34 +0000 (20:26 +0000)]
Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev
John Spurlock [Fri, 7 Nov 2014 20:14:21 +0000 (15:14 -0500)]
Reset rotation-lock-for-accessibility setting on upgrade.
Since it now hides the display setting, force the user to opt-in
again.
Bug:
18104538
Change-Id: I4cac947f7a35ba0f578d059542401dcc5d169307
Sanket Padawe [Fri, 7 Nov 2014 19:47:47 +0000 (19:47 +0000)]
Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev
Dan Stoza [Fri, 7 Nov 2014 19:44:32 +0000 (19:44 +0000)]
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Sanket Padawe [Fri, 7 Nov 2014 19:37:29 +0000 (11:37 -0800)]
API changes to add carrier name to subinforecord
API changes required to add carrier name of sim as a member of subinforecord.
Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
Jason Monk [Fri, 7 Nov 2014 19:32:45 +0000 (19:32 +0000)]
Merge "Fix Build" into lmp-mr1-dev
John Reck [Fri, 7 Nov 2014 19:29:45 +0000 (19:29 +0000)]
Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev
Jason Monk [Fri, 7 Nov 2014 19:25:17 +0000 (14:25 -0500)]
Fix Build
Change-Id: I0f4094718435b219b6e6b1d98435377a42319adb
Jason Monk [Fri, 7 Nov 2014 18:59:22 +0000 (18:59 +0000)]
Merge "Material design for screen pinning cling" into lmp-mr1-dev
Jason Monk [Fri, 7 Nov 2014 18:53:51 +0000 (18:53 +0000)]
Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev
Ricardo Cervera [Fri, 7 Nov 2014 18:46:44 +0000 (18:46 +0000)]
am
10a08abd: am
578e205d: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs automerge:
58dc8c4 automerge:
c9ad13a
* commit '
10a08abd8f9249f66f73070955c2f3f09d45598b':
Tom Taylor [Fri, 7 Nov 2014 18:41:30 +0000 (18:41 +0000)]
am
ad697e58: am
d1290de2: am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana
* commit '
ad697e5820ba624935929bcc9f33b9c38dd28f76':
Tom Taylor [Fri, 7 Nov 2014 18:41:26 +0000 (18:41 +0000)]
am
cc9c81a9: am
1764db5b: am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
db864e4 automerge:
89f7eca
* commit '
cc9c81a90aab5bc5849272fa8a4d2f64366e7c19':
Ricardo Cervera [Fri, 7 Nov 2014 18:39:00 +0000 (18:39 +0000)]
am
578e205d: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs automerge:
58dc8c4 automerge:
c9ad13a
* commit '
578e205d977d66fce491015f1f31ab82c534587d':
John Reck [Fri, 7 Nov 2014 18:34:53 +0000 (18:34 +0000)]
Merge "Fix wrong-thread issue" into lmp-mr1-dev
John Reck [Fri, 7 Nov 2014 18:33:36 +0000 (10:33 -0800)]
Fix finalizer ordering/double-free issue
Bug:
18289984
If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer
Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
Tom Taylor [Fri, 7 Nov 2014 18:33:30 +0000 (18:33 +0000)]
am
d1290de2: am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge
* commit '
d1290de2aabb0f79be29a9c5135fe1049df016d0':
Tom Taylor [Fri, 7 Nov 2014 18:33:27 +0000 (18:33 +0000)]
am
1764db5b: am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
db864e4 automerge:
89f7eca
* commit '
1764db5bf2aad8353f94f28ef4ae6c284adeb547':
John Reck [Fri, 7 Nov 2014 15:53:43 +0000 (07:53 -0800)]
Fix wrong-thread issue
Bug:
18259560
Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
Ricardo Cervera [Fri, 7 Nov 2014 18:30:57 +0000 (18:30 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs automerge:
58dc8c4
automerge:
c9ad13a
* commit '
c9ad13a5e18a6eea512547cba6530cb1eb6a9da8':
Tom Taylor [Fri, 7 Nov 2014 18:29:25 +0000 (18:29 +0000)]
am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
6209d4e
automerge:
739117f
* commit '
739117f1a1f70168461a61219b02a90118641e05':
Tom Taylor [Fri, 7 Nov 2014 18:27:57 +0000 (18:27 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
db864e4
automerge:
89f7eca
* commit '
89f7eca148869850fd5d107acbbb33a0a555fcd6':
destradaa [Fri, 7 Nov 2014 18:22:30 +0000 (18:22 +0000)]
Merge "Mark Gps Raw related APIs as System APIs. b/
16727892" into lmp-mr1-dev
Ricardo Cervera [Fri, 7 Nov 2014 17:49:58 +0000 (17:49 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
automerge:
58dc8c4
* commit '
58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Winson Chung [Fri, 7 Nov 2014 17:41:01 +0000 (17:41 +0000)]
am
e660d6f1: am
4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-dev
* commit '
e660d6f179a01ea18867e9e2126eddd941596953':
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Jeff Davidson [Fri, 7 Nov 2014 17:38:37 +0000 (17:38 +0000)]
Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev
Winson Chung [Fri, 7 Nov 2014 17:34:57 +0000 (17:34 +0000)]
am
4ad2c5ba: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-dev
* commit '
4ad2c5ba9ba39ff6116b657d36f671a4cdd2396f':
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Winson Chung [Fri, 7 Nov 2014 17:30:55 +0000 (17:30 +0000)]
Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-dev
Jason Monk [Thu, 11 Sep 2014 17:36:42 +0000 (13:36 -0400)]
Material design for screen pinning cling
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar. In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.
Bug:
16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
Baligh Uddin [Fri, 7 Nov 2014 15:58:15 +0000 (15:58 +0000)]
am
6aaa61fd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
6aaa61fd55955fd711199035fbd9771dcb8a9656':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Nov 2014 15:52:32 +0000 (15:52 +0000)]
am
63717687: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
637176877e9358dc5badd140cd2b795701e7459c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Nov 2014 15:49:32 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Fri, 7 Nov 2014 15:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Fri, 7 Nov 2014 15:45:41 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Fri, 7 Nov 2014 15:45:35 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Fri, 7 Nov 2014 09:50:28 +0000 (01:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iae4fdd5608681f999b8b8234262b6da60d79eea2
Auto-generated-cl: translation import
Ignacio Solla [Fri, 7 Nov 2014 09:44:54 +0000 (09:44 +0000)]
Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev
Baligh Uddin [Fri, 7 Nov 2014 09:44:33 +0000 (01:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic6355a1f0a89aadd602b3cfa6660f735f6d04d7b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Nov 2014 07:26:52 +0000 (23:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2cd2b6ae9fb2a5114ee931d03e7d1f5aff0bc1e6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 7 Nov 2014 07:11:55 +0000 (23:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
Quddus Chong [Fri, 7 Nov 2014 03:53:14 +0000 (03:53 +0000)]
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
Quddus Chong [Fri, 7 Nov 2014 03:45:33 +0000 (03:45 +0000)]
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
Quddus Chong [Fri, 7 Nov 2014 02:52:28 +0000 (02:52 +0000)]
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
Jim Miller [Fri, 7 Nov 2014 02:18:18 +0000 (02:18 +0000)]
Merge "Fix build" into lmp-mr1-dev
Jim Miller [Fri, 7 Nov 2014 02:05:59 +0000 (18:05 -0800)]
Fix build
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
Andrew Lee [Fri, 7 Nov 2014 01:54:00 +0000 (01:54 +0000)]
Merge "Replace onConferenceChanged with onConnectionAdded." into lmp-mr1-dev
Winson Chung [Fri, 7 Nov 2014 01:30:18 +0000 (01:30 +0000)]
Merge "Adding bounce animation for affiliated tasks. (Bug
16656169)" into lmp-mr1-dev
Winson Chung [Fri, 7 Nov 2014 01:28:07 +0000 (01:28 +0000)]
Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev
Andrew Lee [Fri, 7 Nov 2014 01:00:25 +0000 (17:00 -0800)]
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
Quddus Chong [Fri, 7 Nov 2014 01:11:32 +0000 (01:11 +0000)]
Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075" into lmp-docs
Winson Chung [Wed, 5 Nov 2014 21:41:12 +0000 (13:41 -0800)]
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit
559e6d34b4e76ee21dc6e300681c399ed735a964)
Winson Chung [Fri, 7 Nov 2014 01:07:52 +0000 (17:07 -0800)]
Fixing Recents crash when resetting focus of TaskView already returned to the pool.
Change-Id: Iee789e4e726d5f035ec518f4fec444afecc2bbf2
Anthony Lee [Fri, 7 Nov 2014 00:30:53 +0000 (16:30 -0800)]
Change access to removeConnection so we can override it.
Bug:
18056632
Bug:
18240234
Change-Id: I4e82051a27f3565e9a854df8b27c35300cdbe2ad
Brian Carlstrom [Fri, 7 Nov 2014 00:39:07 +0000 (00:39 +0000)]
Merge "Restore mLazyDexOpt behavior for eng builds" into lmp-mr1-dev
Andre Eisenbach [Fri, 7 Nov 2014 00:27:28 +0000 (00:27 +0000)]
am
df11d588: Fix crash during Bluetooth on/off stress test
* commit '
df11d588bb26ad0e8b8a6e8551393a0abeec2fef':
Fix crash during Bluetooth on/off stress test
Andre Eisenbach [Wed, 29 Oct 2014 19:13:38 +0000 (12:13 -0700)]
Fix crash during Bluetooth on/off stress test
Bug:
18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
(cherry picked from commit
178d3b54cd50558be789c5dfd8dad80ffdc65021)
Amit Mahajan [Fri, 7 Nov 2014 00:17:40 +0000 (00:17 +0000)]
Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev
Luan Nguyen [Fri, 7 Nov 2014 00:17:02 +0000 (00:17 +0000)]
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
Joe Fernandez [Fri, 7 Nov 2014 00:16:58 +0000 (00:16 +0000)]
am
5851fb9b: am
d00ce6c5: am
1d295821: docs: fix for Brand inquiries form
* commit '
5851fb9b820eac653ff9010d49d96cb3df927203':
docs: fix for Brand inquiries form
Luan Nguyen [Fri, 7 Nov 2014 00:10:25 +0000 (00:10 +0000)]
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
Joe Fernandez [Fri, 7 Nov 2014 00:10:21 +0000 (00:10 +0000)]
am
d00ce6c5: am
1d295821: docs: fix for Brand inquiries form
* commit '
d00ce6c537242d8bf6f01122f7faebfc07652e87':
docs: fix for Brand inquiries form
Andres Morales [Fri, 7 Nov 2014 00:06:25 +0000 (00:06 +0000)]
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
Jason Parks [Fri, 7 Nov 2014 00:05:47 +0000 (00:05 +0000)]
am
94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
* commit '
94c3e3bfcfe8d91283560082c737cb62e8d06742':
Fix NPE for CTS.
Jeff Hao [Fri, 7 Nov 2014 00:05:43 +0000 (00:05 +0000)]
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.
Rich Slogar [Fri, 7 Nov 2014 00:05:38 +0000 (00:05 +0000)]
am
d47ab00c: am
830790ba: am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
d47ab00cc4f15287c8b48ed5805c4e9766facb58':
docs:Remove tools/index.jd file.
Luan Nguyen [Fri, 7 Nov 2014 00:05:20 +0000 (00:05 +0000)]
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
Joe Fernandez [Fri, 7 Nov 2014 00:05:16 +0000 (00:05 +0000)]
am
1d295821: docs: fix for Brand inquiries form
* commit '
1d295821355c6a1ffcb01866e38664343570129e':
docs: fix for Brand inquiries form
ztenghui [Thu, 6 Nov 2014 23:59:15 +0000 (23:59 +0000)]
Merge "A better looking and faster spot shadow." into lmp-mr1-dev
Andres Morales [Thu, 6 Nov 2014 23:57:25 +0000 (23:57 +0000)]
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
Andres Morales [Thu, 6 Nov 2014 23:50:56 +0000 (23:50 +0000)]
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
Yohei Yukawa [Thu, 6 Nov 2014 23:45:19 +0000 (23:45 +0000)]
Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev
Andres Morales [Tue, 4 Nov 2014 22:56:16 +0000 (14:56 -0800)]
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
Luan Nguyen [Thu, 6 Nov 2014 23:26:51 +0000 (23:26 +0000)]
Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
destradaa [Thu, 6 Nov 2014 23:22:41 +0000 (23:22 +0000)]
Merge "Add support for GPS measurement/navigation message capabilities. b/
16727892 b/
16815124" into lmp-mr1-dev
ztenghui [Wed, 29 Oct 2014 23:04:29 +0000 (16:04 -0700)]
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
Joe Fernandez [Thu, 6 Nov 2014 22:53:04 +0000 (14:53 -0800)]
docs: fix for Brand inquiries form
b/
18162023
Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
Jason Parks [Thu, 6 Nov 2014 22:23:01 +0000 (22:23 +0000)]
Merge "Fix NPE for CTS." into lmp-sprout-dev
Winson Chung [Thu, 6 Nov 2014 19:05:19 +0000 (11:05 -0800)]
Adding bounce animation for affiliated tasks. (Bug
16656169)
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
Craig Mautner [Thu, 6 Nov 2014 21:59:49 +0000 (13:59 -0800)]
Add logging for failure to finish.
Will help with bug
17648830.
Change-Id: Ib73c14cee332649a3e57a4779814a394f7d13173
Sreeram Ramachandran [Thu, 6 Nov 2014 21:57:20 +0000 (21:57 +0000)]
Merge "Send broadcasts when VPNs come and go." into lmp-mr1-dev
destradaa [Thu, 6 Nov 2014 21:50:39 +0000 (21:50 +0000)]
Merge "Fix reference leak in GPS measurement JNI layer. b/
16727892 b/
17075171" into lmp-mr1-dev
RoboErik [Thu, 6 Nov 2014 21:20:17 +0000 (21:20 +0000)]
Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
* changes:
Update metadata artwork and uri docs
skip MediaController callbacks if it's been unregistered
Sailesh Nepal [Thu, 6 Nov 2014 21:06:34 +0000 (21:06 +0000)]
Merge "Make APIs to get system phone accounts public" into lmp-mr1-dev
Jason Monk [Fri, 12 Sep 2014 14:59:21 +0000 (10:59 -0400)]
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
Jeremy Joslin [Thu, 6 Nov 2014 20:51:23 +0000 (20:51 +0000)]
Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev
Amith Yamasani [Thu, 6 Nov 2014 20:50:59 +0000 (20:50 +0000)]
Merge "Fix singleUser provider grants" into lmp-mr1-dev
Craig Mautner [Thu, 6 Nov 2014 20:49:35 +0000 (20:49 +0000)]
Merge "More fixes for keyguard animations." into lmp-mr1-dev
Jeff Hao [Thu, 6 Nov 2014 20:45:00 +0000 (20:45 +0000)]
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-sprout-dev
Rich Slogar [Thu, 6 Nov 2014 20:39:18 +0000 (20:39 +0000)]
am
830790ba: am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
830790baf8c35942832c5e7fb2467be6112048f4':
docs:Remove tools/index.jd file.
Vinod Krishnan [Thu, 6 Nov 2014 20:34:58 +0000 (20:34 +0000)]
am
1d6d4272: Adding wallpaper animations
* commit '
1d6d427278d22d08ef60e5d76162b823e8ad58ed':
Adding wallpaper animations
Ricardo Cervera [Thu, 6 Nov 2014 20:34:53 +0000 (20:34 +0000)]
am
126eda32: am
b4a19198: am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
126eda32ebc1c61ff0a6a7a93093c71f2ac73d43':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 20:34:49 +0000 (20:34 +0000)]
am
3bde026a: am
afb6b50e: Merge "DO NOT MERGE: Don\'t log passwords returned from vdc" into lmp-dev
* commit '
3bde026aebffdaea8ab1315977b05e53e4a75185':
DO NOT MERGE: Don't log passwords returned from vdc
Ricardo Cervera [Thu, 6 Nov 2014 20:34:45 +0000 (20:34 +0000)]
am
0a285d4a: am
9bc1b15a: am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
0a285d4a3483011a57ecd4201db3fd38bb1d628f':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Dirk Dougherty [Thu, 6 Nov 2014 20:34:28 +0000 (20:34 +0000)]
am
61a76f2d: am
f15017fc: am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
61a76f2d7919cd6375cf4463b8bd69a608057d93':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 20:34:18 +0000 (20:34 +0000)]
am
2acfc3b9: am
d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
* commit '
2acfc3b9e2aca9277e8e4763352fc2976d0c2094':
Doc change: Add play dev guide page with index card and shareable download.
Joe Fernandez [Thu, 6 Nov 2014 20:34:14 +0000 (20:34 +0000)]
am
93f89657: am
ab6e9048: am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
93f8965768484e758c2c87b919340ee932fcfd9d':
docs: Add more information for getting started with TV app
Justin Koh [Thu, 6 Nov 2014 20:33:36 +0000 (20:33 +0000)]
am
b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
* commit '
b8038d58da04456e9e7b6e264af69226bf21592c':
Hide Surface#lockHardwareCanvas DO NOT MERGE
Rich Slogar [Thu, 6 Nov 2014 20:33:30 +0000 (20:33 +0000)]
am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
b0af6987aacec95b90c655f7e9bd9576baaab3df':
docs:Remove tools/index.jd file.
OSDN Git Service
