OSDN Git Service
smain@google.com [Thu, 11 Dec 2014 03:39:57 +0000 (03:39 +0000)]
am
9a6d1d9f: am
c0f96532: am
8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge:
e04a9fc
automerge:
bac113b
* commit '
bac113bbcbe7780ca658f09019e5118ec851cd07':
add helpouts widget to wave 3 pages
Luan Nguyen [Thu, 11 Dec 2014 03:38:41 +0000 (03:38 +0000)]
am
25964a85: am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index. automerge:
75ec24e
automerge:
8470943
* commit '
847094397ebac9ab2c5bb7e11844fd2b533bd209':
docs: Fix link for moved Android Studio index.
smain@google.com [Thu, 11 Dec 2014 03:04:20 +0000 (03:04 +0000)]
am
9a6d1d9f: am
c0f96532: am
8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge:
e04a9fc
* commit '
9a6d1d9fba9f32bd7d7f215637c4ae932d550f57':
add helpouts widget to wave 3 pages
Luan Nguyen [Thu, 11 Dec 2014 03:04:14 +0000 (03:04 +0000)]
am
25964a85: am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index. automerge:
75ec24e
* commit '
25964a854a0f41a74136c7dbc1c459ba6ef0e20b':
docs: Fix link for moved Android Studio index.
smain@google.com [Thu, 11 Dec 2014 02:56:17 +0000 (02:56 +0000)]
am
c0f96532: am
8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
automerge:
e04a9fc
* commit '
e04a9fcc2edc4b2527c8233e16f823cec6fb58cc':
add helpouts widget to wave 3 pages
Luan Nguyen [Thu, 11 Dec 2014 02:54:57 +0000 (02:54 +0000)]
am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index.
automerge:
75ec24e
* commit '
75ec24e26900fa6e0def1f5e946be41614d8e520':
docs: Fix link for moved Android Studio index.
Dianne Hackborn [Thu, 11 Dec 2014 02:10:23 +0000 (02:10 +0000)]
am
84adc43a: Merge "Fix issue #
18706195: Improve label names of memory types" into lmp-mr1-dev
automerge:
0f050ea
* commit '
0f050ea40204242387eac8f7f5949ea16c143515':
Fix issue #
18706195: Improve label names of memory types
Dianne Hackborn [Thu, 11 Dec 2014 02:05:11 +0000 (02:05 +0000)]
am
84adc43a: Merge "Fix issue #
18706195: Improve label names of memory types" into lmp-mr1-dev
* commit '
84adc43a70302278eea4d9c198e14c88d6432f9c':
Fix issue #
18706195: Improve label names of memory types
Dianne Hackborn [Thu, 11 Dec 2014 01:58:50 +0000 (01:58 +0000)]
Merge "Fix issue #
18706195: Improve label names of memory types" into lmp-mr1-dev
John Reck [Thu, 11 Dec 2014 01:25:54 +0000 (01:25 +0000)]
am
eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
automerge:
e4a6ed9
* commit '
e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7':
Don't preload textures for AssetAtlas
John Reck [Thu, 11 Dec 2014 01:23:06 +0000 (01:23 +0000)]
am
eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev
* commit '
eb2dcc791e649e07ec8114e00752b54965c46e65':
Don't preload textures for AssetAtlas
John Reck [Thu, 11 Dec 2014 01:12:29 +0000 (01:12 +0000)]
Merge "Don't preload textures for AssetAtlas" into lmp-mr1-dev
John Reck [Thu, 11 Dec 2014 00:47:36 +0000 (16:47 -0800)]
Don't preload textures for AssetAtlas
Bug:
18317479
RenderNode::prepareSubTree calls prefetchAndMarkInUse
on every bitmapResoruce in the DisplayList. However,
this resulted in textures being uploaded for bitmaps
that would be drawn from the AssetAtlas instead.
To fix this we teach TextureCache about the AssetAtlas
so that calls to TextureCache return the Texture from
AssetAtlas if it exists. Thus usage of AssetAtlas
is now purely to allow for further optimizations via
draw merging instead of a requirement to get
any benefit at all.
Change-Id: I65282fa05bac46f4e93822b3467ffa0261ccf200
Dianne Hackborn [Thu, 11 Dec 2014 00:06:10 +0000 (16:06 -0800)]
Fix issue #
18706195: Improve label names of memory types
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
Alan Viverette [Thu, 11 Dec 2014 00:37:51 +0000 (00:37 +0000)]
Alan Viverette [Thu, 11 Dec 2014 00:36:19 +0000 (00:36 +0000)]
Alan Viverette [Thu, 11 Dec 2014 00:32:53 +0000 (00:32 +0000)]
am
4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
automerge:
c211857
* commit '
c211857af37eabb6073fa2ac402c9f7de9548822':
Update tint filter after setting gradient drawable state
Alan Viverette [Thu, 11 Dec 2014 00:28:43 +0000 (16:28 -0800)]
Fix build
Change-Id: I2efdf2790aa768eaaa6e7e0b80a9ad7b2ddf3cb9
Alan Viverette [Thu, 11 Dec 2014 00:29:51 +0000 (00:29 +0000)]
am
4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
* commit '
4e1374378d41f15cefc1f5889fd4d549461485ff':
Update tint filter after setting gradient drawable state
Winson Chung [Thu, 11 Dec 2014 00:28:57 +0000 (00:28 +0000)]
am
e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug
18574950)" into lmp-mr1-dev
automerge:
b485445
* commit '
b4854456c0e9092900a6432eb90d7c552c029070':
Fixing major regressions in Recents with multi-user. (Bug
18574950)
Shishir Agrawal [Thu, 11 Dec 2014 00:24:33 +0000 (00:24 +0000)]
am
960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge:
951dcdd
* commit '
960dccebf576d53059fd7d026cdd1b81fb0b5974':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
Amith Yamasani [Thu, 11 Dec 2014 00:24:26 +0000 (00:24 +0000)]
am
a2530e4a: am
ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev
* commit '
a2530e4aa4c35787516ffea8368c0ebc35da4df4':
Stop guest user on exiting, to conserve resources
Alan Viverette [Thu, 11 Dec 2014 00:23:32 +0000 (00:23 +0000)]
Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
Dmitriy Ivanov [Thu, 11 Dec 2014 00:22:00 +0000 (16:22 -0800)]
resolve merge conflicts of
2b0f2db to lmp-mr1-dev-plus-aosp.
Change-Id: I5cbcf74319afc3ae9d0e9280b572a59286565de8
Dmitriy Ivanov [Thu, 11 Dec 2014 00:07:50 +0000 (00:07 +0000)]
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp
Alan Viverette [Thu, 11 Dec 2014 00:07:32 +0000 (00:07 +0000)]
am
7171bf40: am
6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
* commit '
7171bf40eca7dc0a044f0378082d7f7c1dfa2348':
Always call onDateChanged() when the date picker selection changes
Dianne Hackborn [Thu, 11 Dec 2014 00:07:26 +0000 (00:07 +0000)]
am
dc1e9f48: am
e207ffe0: Merge "Fix issue #
18683980: questions on LMK memory changes" into lmp-mr1-dev
* commit '
dc1e9f4813c61354f7e7459708684e4241b12e90':
Fix issue #
18683980: questions on LMK memory changes
Alan Viverette [Thu, 11 Dec 2014 00:07:20 +0000 (00:07 +0000)]
am
3d517a70: am
62b780e8: Avoid creating futures for drawables with no constant state
* commit '
3d517a701cb583f59ed8deefd21ab854c3890065':
Avoid creating futures for drawables with no constant state
Adam Lesinski [Thu, 11 Dec 2014 00:07:02 +0000 (00:07 +0000)]
am
740acf21: am
c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
* commit '
740acf213c56c406132294790fa2fadd0380cfa7':
Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
Jason Monk [Thu, 11 Dec 2014 00:06:53 +0000 (00:06 +0000)]
am
65c08ec8: am
4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
* commit '
65c08ec82a11eeb2ea8b048935ddafc694fc0236':
Handle policy change while keyguard disabled
Jason Monk [Thu, 11 Dec 2014 00:06:21 +0000 (00:06 +0000)]
am
4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
automerge:
65c08ec
* commit '
65c08ec82a11eeb2ea8b048935ddafc694fc0236':
Handle policy change while keyguard disabled
Winson Chung [Thu, 11 Dec 2014 00:03:21 +0000 (00:03 +0000)]
am
e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug
18574950)" into lmp-mr1-dev
* commit '
e405e59e5b10aaf64c5f10e1336f43e092ce390b':
Fixing major regressions in Recents with multi-user. (Bug
18574950)
Alan Viverette [Thu, 11 Dec 2014 00:00:43 +0000 (16:00 -0800)]
Update tint filter after setting gradient drawable state
BUG:
18706381
Change-Id: I7d664303c9b796243da6c55d1ea9482736aabf07
Winson Chung [Wed, 10 Dec 2014 23:54:38 +0000 (23:54 +0000)]
Merge "Fixing major regressions in Recents with multi-user. (Bug
18574950)" into lmp-mr1-dev
smain@google.com [Wed, 10 Dec 2014 23:49:17 +0000 (23:49 +0000)]
am
c0f96532: am
8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
* commit '
c0f96532caa62f477af33a271b546a7d0c932c36':
add helpouts widget to wave 3 pages
smain@google.com [Wed, 10 Dec 2014 23:37:52 +0000 (23:37 +0000)]
am
8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
* commit '
8cd0bb2df377b2452d5b12ac5057143da4ecb899':
add helpouts widget to wave 3 pages
Shishir Agrawal [Wed, 10 Dec 2014 23:36:24 +0000 (23:36 +0000)]
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
automerge:
951dcdd
* commit '
951dcdd9404054f6b7e794b18aad6f50e44732f9':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
Chris Craik [Wed, 10 Dec 2014 23:23:54 +0000 (15:23 -0800)]
resolve merge conflicts of
ed211b9 to lmp-mr1-dev-plus-aosp.
Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991
Shishir Agrawal [Wed, 10 Dec 2014 23:19:14 +0000 (23:19 +0000)]
Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
Amith Yamasani [Wed, 10 Dec 2014 23:18:26 +0000 (23:18 +0000)]
am
ee24d848: Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev
* commit '
ee24d848a5f270fb2d18150ab14200e62c9fd118':
Stop guest user on exiting, to conserve resources
Winson Chung [Tue, 9 Dec 2014 01:26:44 +0000 (17:26 -0800)]
Fixing major regressions in Recents with multi-user. (Bug
18574950)
In the process of front-loading a lot of the loading work, we moved logic
into AlternateRecentsComponent, which is not multi-user friendly. This CL
proxies all the necessary events for non-primary users to their own SystemUI
process to ensure that they handle them correctly, and proxies visibility
changes back to the primary user (since that is the only process with the
right callbacks).
Change-Id: I9fed92214ac4d4e2309ad6ffc35d09b5726c2880
smain@google.com [Wed, 10 Dec 2014 23:07:36 +0000 (23:07 +0000)]
Merge "add helpouts widget to wave 3 pages" into lmp-docs
Amith Yamasani [Wed, 10 Dec 2014 22:54:27 +0000 (22:54 +0000)]
Merge "Stop guest user on exiting, to conserve resources" into lmp-mr1-dev
Dmitriy Ivanov [Wed, 10 Dec 2014 22:31:40 +0000 (22:31 +0000)]
am
cd13ae76: Merge "Switch to libsigchain.a" into lmp-mr1-dev
* commit '
cd13ae76a54a2cd7f20730579486834c326fa272':
Switch to libsigchain.a
Dmitriy Ivanov [Wed, 10 Dec 2014 22:24:44 +0000 (22:24 +0000)]
Merge "Switch to libsigchain.a" into lmp-mr1-dev
Amith Yamasani [Tue, 9 Dec 2014 20:30:04 +0000 (12:30 -0800)]
Stop guest user on exiting, to conserve resources
Bug:
18672730
Change-Id: I17bc26ce2e10ceebeb18b75565daf21aa7df7774
Luan Nguyen [Wed, 10 Dec 2014 22:12:20 +0000 (22:12 +0000)]
am
7e1b348a: am
4221d7e4: docs: Fix link for moved Android Studio index.
* commit '
7e1b348ac55d4368172809031808a39576d00eea':
docs: Fix link for moved Android Studio index.
Alan Viverette [Wed, 10 Dec 2014 22:12:04 +0000 (22:12 +0000)]
am
6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
* commit '
6c42ee470307eee56a21062ad67b67878aa9392d':
Always call onDateChanged() when the date picker selection changes
Alan Viverette [Wed, 10 Dec 2014 22:06:12 +0000 (22:06 +0000)]
Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev
Luan Nguyen [Wed, 10 Dec 2014 22:04:20 +0000 (22:04 +0000)]
am
4221d7e4: docs: Fix link for moved Android Studio index.
* commit '
4221d7e4cbcea9ea6be56322c7839f31b2afb828':
docs: Fix link for moved Android Studio index.
Dianne Hackborn [Wed, 10 Dec 2014 21:59:39 +0000 (21:59 +0000)]
am
e207ffe0: Merge "Fix issue #
18683980: questions on LMK memory changes" into lmp-mr1-dev
* commit '
e207ffe01d3e9185f2cac9501354a5236abcedad':
Fix issue #
18683980: questions on LMK memory changes
Alan Viverette [Wed, 10 Dec 2014 21:59:32 +0000 (21:59 +0000)]
am
62b780e8: Avoid creating futures for drawables with no constant state
* commit '
62b780e85ff2fcefd4324c3bfbf49b14963cf58b':
Avoid creating futures for drawables with no constant state
Dianne Hackborn [Wed, 10 Dec 2014 21:56:07 +0000 (21:56 +0000)]
Merge "Fix issue #
18683980: questions on LMK memory changes" into lmp-mr1-dev
Alan Viverette [Wed, 10 Dec 2014 21:52:28 +0000 (13:52 -0800)]
Avoid creating futures for drawables with no constant state
We don't need to create futures for drawables without constant state,
since we only copy on mutate and we don't need to do any work on mutate()
for drawables without shared constant state. Also we would crash in that
case, so avoiding the NPE is nice too.
Rider: Also fixes elevations again.
BUG:
18696100
Change-Id: I4d7737f39ce3efc5830704e5ce412c540603e6ac
Luan Nguyen [Wed, 10 Dec 2014 21:42:05 +0000 (13:42 -0800)]
docs: Fix link for moved Android Studio index.
Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65
Adam Lesinski [Wed, 10 Dec 2014 21:19:58 +0000 (21:19 +0000)]
am
c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
* commit '
c78018774503308e8c8266f6769c9e4c895f3a97':
Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
Adam Lesinski [Wed, 10 Dec 2014 21:12:02 +0000 (21:12 +0000)]
Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
Jason Monk [Wed, 10 Dec 2014 21:11:30 +0000 (21:11 +0000)]
am
4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
* commit '
4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691':
Handle policy change while keyguard disabled
Jason Monk [Wed, 10 Dec 2014 21:04:24 +0000 (21:04 +0000)]
Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev
Chris Craik [Wed, 10 Dec 2014 21:01:30 +0000 (21:01 +0000)]
am
f441557d: Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev
* commit '
f441557d89cab8885940bb63a27159f576749f96':
Fix frame-allocated path lifecycles
Chris Craik [Wed, 10 Dec 2014 20:53:45 +0000 (20:53 +0000)]
Merge "Fix frame-allocated path lifecycles" into lmp-mr1-dev
Benjamin Franz [Wed, 10 Dec 2014 20:36:22 +0000 (20:36 +0000)]
am
a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev
automerge:
df55bf4
* commit '
df55bf45e8ebcf699b9b4574db9119809935c549':
Only add successfully bound profile services to mProfileServices.
Benjamin Franz [Wed, 10 Dec 2014 20:34:36 +0000 (20:34 +0000)]
am
a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev
* commit '
a96ba381cf7ecbed31da94b8ebc93da3c42151ad':
Only add successfully bound profile services to mProfileServices.
Benjamin Franz [Wed, 10 Dec 2014 20:29:22 +0000 (20:29 +0000)]
Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev
Chris Craik [Wed, 10 Dec 2014 00:54:03 +0000 (16:54 -0800)]
Fix frame-allocated path lifecycles
bug:
18667472
Previously, we were allocating per-frame temporary paths within the
PlaybackStateStruct, but these are not safe as layers allocate these
transiently. Instead, move these to the OpenGLRenderer, which has
better define lifecycle.
Additionally, don't store SkPath objects directly in vector, since
they are then subject to relocation.
Change-Id: I8187ef542fcd5b030502bb75eb123ee26c0daa96
Joe Fernandez [Wed, 10 Dec 2014 20:04:31 +0000 (20:04 +0000)]
am
844af56b: am
efab8b6f: am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
automerge:
15cfa4f
* commit '
15cfa4f3012f9bdb39b0c9c0d339b3d76694abfa':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 20:02:29 +0000 (20:02 +0000)]
am
844af56b: am
efab8b6f: am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
844af56b85260d9e6a8e89436a5e8862fbeb3812':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:56:05 +0000 (19:56 +0000)]
am
5a64a475: am
9727d191: am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
automerge:
4ded0a1
* commit '
4ded0a166f96da7bcb377c0573ba373b77fe596e':
docs:studio basic links
Joe Fernandez [Wed, 10 Dec 2014 19:54:51 +0000 (19:54 +0000)]
am
efab8b6f: am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
efab8b6fd50e2e4ad3adb03c4bca2bc531ae5d42':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:54:35 +0000 (19:54 +0000)]
am
5a64a475: am
9727d191: am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
5a64a47580e9b384e83ba81e8f2cbb848497ac61':
docs:studio basic links
Joe Fernandez [Wed, 10 Dec 2014 19:47:11 +0000 (19:47 +0000)]
am
bdd6aabd: am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
bdd6aabd1fd98762b22bb347d24c99e2c388d166':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:46:37 +0000 (19:46 +0000)]
am
9727d191: am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
9727d1910052e600ebcf417c9fe55436ecf2c9de':
docs:studio basic links
Svet Ganov [Wed, 10 Dec 2014 19:43:33 +0000 (19:43 +0000)]
am
e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev
automerge:
a706c90
* commit '
a706c9079a60531d79a3f32f263c37f386229564':
Ignore accessibility overlay when computing window's interactive region.
Svet Ganov [Wed, 10 Dec 2014 19:42:08 +0000 (19:42 +0000)]
am
e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev
* commit '
e39fc96c04a09a58acb2547a2066e0662791a69b':
Ignore accessibility overlay when computing window's interactive region.
Joe Fernandez [Wed, 10 Dec 2014 19:38:28 +0000 (19:38 +0000)]
am
d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
* commit '
d49977d967d7db24466abba9a97084a955f56aff':
docs: update debug menu for debugging-studio
Joe Fernandez [Wed, 10 Dec 2014 19:38:17 +0000 (19:38 +0000)]
am
534ae165: am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
534ae165f374d81335dc1b7742df1168c8d5ae36':
docs:studio basic links
Luan Nguyen [Wed, 10 Dec 2014 19:36:26 +0000 (19:36 +0000)]
am
596d4e72: am
c9e5c5f7: am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
automerge:
ee501ed
* commit '
ee501ed8483bc66fbff38769da921a37837297f2':
docs: Fix text on step 5 of the opt-in steps
Svet Ganov [Wed, 10 Dec 2014 19:35:03 +0000 (19:35 +0000)]
Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev
Luan Nguyen [Wed, 10 Dec 2014 19:34:30 +0000 (19:34 +0000)]
am
596d4e72: am
c9e5c5f7: am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
596d4e7230ae1858aaafbae7987e46d65181f1bd':
docs: Fix text on step 5 of the opt-in steps
Joe Fernandez [Wed, 10 Dec 2014 19:31:10 +0000 (19:31 +0000)]
Merge "docs: update debug menu for debugging-studio" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:30:37 +0000 (19:30 +0000)]
am
3454091d: Merge "docs:studio basic links" into lmp-docs
* commit '
3454091dad65256730b714d8ce0f89c137c1c0c2':
docs:studio basic links
John Spurlock [Wed, 10 Dec 2014 19:30:36 +0000 (19:30 +0000)]
am
e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev
automerge:
24ca556
* commit '
24ca556dcea46d21045485626a82e9c1ad244bd6':
NoMan: Apply audio restrictions when effects are disabled by listeners.
Luan Nguyen [Wed, 10 Dec 2014 19:26:37 +0000 (19:26 +0000)]
am
c9e5c5f7: am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
c9e5c5f72a563c7b8e030a57cf586941d32006f4':
docs: Fix text on step 5 of the opt-in steps
Dianne Hackborn [Wed, 10 Dec 2014 19:26:35 +0000 (19:26 +0000)]
am
d6372242: Merge "Further work on issue #
18640385: Add procstats test mode" into lmp-mr1-dev
automerge:
d525891
* commit '
d52589185f57ce7eb633d12dec98e4bbae4e33fd':
Further work on issue #
18640385: Add procstats test mode
Geoff Mendal [Wed, 10 Dec 2014 19:25:10 +0000 (19:25 +0000)]
am
5431d1e9: (-s ours) am
2bb00d52: (-s ours) Import translations. DO NOT MERGE
automerge:
da409fe -s ours
* commit '
da409fea8230c49666ed634aeb7db629fb9425f3':
Import translations. DO NOT MERGE
Alan Viverette [Wed, 10 Dec 2014 19:24:27 +0000 (11:24 -0800)]
Always call onDateChanged() when the date picker selection changes
BUG:
18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
Wink Saville [Wed, 10 Dec 2014 19:23:23 +0000 (19:23 +0000)]
am
eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev
automerge:
afd6f5a
* commit '
afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
Update API and documentation for invalid subscriptions id's
Joe Fernandez [Wed, 10 Dec 2014 19:23:15 +0000 (19:23 +0000)]
Merge "docs:studio basic links" into lmp-docs
John Spurlock [Wed, 10 Dec 2014 19:22:41 +0000 (19:22 +0000)]
am
e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev
* commit '
e03e245610c7f406a6cc0de998d71313a285953a':
NoMan: Apply audio restrictions when effects are disabled by listeners.
Dianne Hackborn [Wed, 10 Dec 2014 19:21:58 +0000 (19:21 +0000)]
am
6bdbae07: Merge "Fix issue #
18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
automerge:
7557ec1
* commit '
7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
Fix issue #
18665625 CTS:android.app.cts.InstrumentationTest#...
Geoff Mendal [Wed, 10 Dec 2014 19:20:38 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
e1bc1c6 -s ours
* commit '
e1bc1c6c9fb8d019813cd8866f5433bb3f4adb04':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 19:19:18 +0000 (19:19 +0000)]
am
295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge:
2f5e130 -s ours
* commit '
2f5e130d4d16eb80e72e492230dec843e1d2c9b2':
Import translations. DO NOT MERGE
Luan Nguyen [Wed, 10 Dec 2014 19:19:05 +0000 (19:19 +0000)]
am
8a65df39: am
258da738: docs: Fix text on step 5 of the opt-in steps
* commit '
8a65df39e6ad2fc357c8a327626f40588ce00553':
docs: Fix text on step 5 of the opt-in steps
Craig Mautner [Wed, 10 Dec 2014 19:17:53 +0000 (19:17 +0000)]
am
7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev
automerge:
8642803
* commit '
864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed':
Add put/getBoolean/Array to PersistableBundle
Jorim Jaggi [Wed, 10 Dec 2014 19:16:38 +0000 (19:16 +0000)]
am
c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
automerge:
57b440e
* commit '
57b440e206f142368bcf42885d3f3763554173e8':
Fix SysUI when an app started from the affordances crashes
Dan Sandler [Wed, 10 Dec 2014 19:15:11 +0000 (19:15 +0000)]
am
35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
automerge:
b394253
* commit '
b394253a3f86df065783d5c07250c155428702e5':
BluetoothControllerImpl: track bluetooth better
John Spurlock [Wed, 10 Dec 2014 19:14:25 +0000 (19:14 +0000)]
Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev
Rich Slogar [Tue, 9 Dec 2014 01:25:48 +0000 (17:25 -0800)]
docs: update debug menu for debugging-studio
Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f
Geoff Mendal [Wed, 10 Dec 2014 19:13:46 +0000 (19:13 +0000)]
am
fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge:
4ce2c65 -s ours
* commit '
4ce2c654bda8f2a78bf4821ea39b146e626c8b60':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 19:12:31 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge:
83c26e1 -s ours
* commit '
83c26e18fc05a07b84698cb02b7a077102f90335':
Import translations. DO NOT MERGE
OSDN Git Service
