OSDN Git Service
Craig Mautner [Mon, 1 Dec 2014 21:00:51 +0000 (21:00 +0000)]
am
9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev
* commit '
9dba10732802bf162c0098d2591aa284e55b7b5e':
Force additional layout pass after drawing
Craig Mautner [Mon, 1 Dec 2014 20:56:07 +0000 (20:56 +0000)]
Merge "Force additional layout pass after drawing" into lmp-mr1-dev
Wale Ogunwale [Mon, 1 Dec 2014 20:30:33 +0000 (20:30 +0000)]
am
997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit '
997e632f59b070dabf71d9e807847c0643da92ac':
Added unique id to display devices and their settings.
Wale Ogunwale [Mon, 1 Dec 2014 20:26:05 +0000 (20:26 +0000)]
Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
Shishir Agrawal [Mon, 1 Dec 2014 20:22:36 +0000 (20:22 +0000)]
am
089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
* commit '
089f95f4483c95873cf0084c11cb23a0f5b32c3c':
TelephonyManager.setLine1NumberForDisplay should return a boolean.
Shishir Agrawal [Mon, 1 Dec 2014 20:17:24 +0000 (20:17 +0000)]
Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
Chris Craik [Mon, 1 Dec 2014 20:13:06 +0000 (20:13 +0000)]
am
659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
* commit '
659de832b9796e14de44b6411980a65e33283a93':
Enable stencil clipping within clearLayerRegions
Chris Craik [Mon, 1 Dec 2014 20:08:27 +0000 (20:08 +0000)]
Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 19:50:17 +0000 (19:50 +0000)]
am
f90404ca: (-s ours) am
ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f90404ca7b47234437b3f8f418fca313825de02c':
Import translations. DO NOT MERGE
Joe Fernandez [Mon, 1 Dec 2014 19:50:12 +0000 (19:50 +0000)]
am
353da3f9: am
88e04fcb: am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
353da3f98d86eb750b756335892c768f76cc4616':
docs: December 2014 Dashboard update
smain@google.com [Mon, 1 Dec 2014 19:50:07 +0000 (19:50 +0000)]
am
77e889ed: am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
77e889ed84ea0f626a9164fad50299d131a1cac1':
change Trulia context image
Shishir Agrawal [Mon, 1 Dec 2014 19:48:53 +0000 (11:48 -0800)]
TelephonyManager.setLine1NumberForDisplay should return a boolean.
The call can fail and should return the success status of the call.
Bug:
18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
Geoff Mendal [Mon, 1 Dec 2014 19:44:10 +0000 (19:44 +0000)]
am
ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ff26f10fab3e79d535001b8e1c9155d7844375c4':
Import translations. DO NOT MERGE
Joe Fernandez [Mon, 1 Dec 2014 19:44:04 +0000 (19:44 +0000)]
am
88e04fcb: am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
docs: December 2014 Dashboard update
smain@google.com [Mon, 1 Dec 2014 19:43:58 +0000 (19:43 +0000)]
am
446bab79: am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
446bab79564e50c497e6ce5cf75a30ddd94855fe':
change Trulia context image
Jeremy Joslin [Mon, 1 Dec 2014 19:42:24 +0000 (19:42 +0000)]
am
500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit '
500f781110dee5aad53410e9ef9b4003123c6981':
Fix the ordering of extra values in the PI.
Jeremy Joslin [Mon, 1 Dec 2014 19:36:01 +0000 (19:36 +0000)]
Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
Alan Viverette [Mon, 1 Dec 2014 19:17:30 +0000 (19:17 +0000)]
am
015b9e56: Merge "Cancel dialog when TimePickerDialog\'s BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
* commit '
015b9e56d4ad528dd406672ef6264c85e41a20fd':
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
Alan Viverette [Mon, 1 Dec 2014 19:12:47 +0000 (19:12 +0000)]
Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 19:11:02 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 1 Dec 2014 19:09:20 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48e6cd1b92557727fbd8ee2d803f0121538831d9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 19:04:58 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Jeff Sharkey [Mon, 1 Dec 2014 19:00:56 +0000 (19:00 +0000)]
am
b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
* commit '
b9ccc047ca9c1cd4f1c0143f230a4005fa4864a4':
Sanitize display names, keep extensions intact.
Jeff Sharkey [Mon, 1 Dec 2014 19:00:51 +0000 (19:00 +0000)]
am
e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
* commit '
e4a5faa61e9084333b241531ddb941684f110566':
APK still has privileged flag after being moved from "/system/priv-app"
Geoff Mendal [Mon, 1 Dec 2014 18:59:03 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic9c2d5dfcae9b229040c8460ab2a9820d44fa18c
Auto-generated-cl: translation import
Joe Fernandez [Mon, 1 Dec 2014 18:58:36 +0000 (18:58 +0000)]
am
e9a816c5: am
1f5acf84: docs: December 2014 Dashboard update
* commit '
e9a816c5934e4c12a865fdab4994ea286c01009d':
docs: December 2014 Dashboard update
Jeff Sharkey [Mon, 1 Dec 2014 18:57:02 +0000 (18:57 +0000)]
Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
Jeff Sharkey [Mon, 1 Dec 2014 18:56:55 +0000 (18:56 +0000)]
Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
Joe Fernandez [Mon, 1 Dec 2014 18:51:54 +0000 (18:51 +0000)]
am
1f5acf84: docs: December 2014 Dashboard update
* commit '
1f5acf84800f58607e5e9f36c48e3b53f10c1163':
docs: December 2014 Dashboard update
Joe Fernandez [Mon, 1 Dec 2014 18:25:01 +0000 (10:25 -0800)]
docs: December 2014 Dashboard update
Change-Id: I80e2477d02ef5eb0964ae6e68ffa11d703db4fe5
Jason Monk [Mon, 1 Dec 2014 18:38:19 +0000 (18:38 +0000)]
am
03d705ab: Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
* commit '
03d705abd60dcd918ae7dcce4c9c48299c1c4995':
SysUI: QS Wifi get connected wifi rssi from NC
Amith Yamasani [Mon, 1 Dec 2014 18:38:14 +0000 (18:38 +0000)]
am
731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
* commit '
731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
Fix parsing bug that affects reading back guest restrictions
Jason Monk [Mon, 1 Dec 2014 18:33:37 +0000 (18:33 +0000)]
Merge "SysUI: QS Wifi get connected wifi rssi from NC" into lmp-mr1-dev
Amith Yamasani [Mon, 1 Dec 2014 18:32:10 +0000 (18:32 +0000)]
Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev
smain@google.com [Mon, 1 Dec 2014 18:08:58 +0000 (18:08 +0000)]
am
7512a46e: am
fdff66ee: change Trulia context image
* commit '
7512a46e7e9dfcd6e522e8229b91a63b9e9189de':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 18:04:39 +0000 (18:04 +0000)]
am
fdff66ee: change Trulia context image
* commit '
fdff66ee030869f0f5cb3d1614d66f7d087e2008':
change Trulia context image
smain@google.com [Mon, 1 Dec 2014 17:40:42 +0000 (09:40 -0800)]
change Trulia context image
Change-Id: I99e43b358af518750cf7ddae4856bb8ee42729f5
Jeff Sharkey [Wed, 26 Nov 2014 21:38:26 +0000 (13:38 -0800)]
Sanitize display names, keep extensions intact.
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames. This also fixes
a handful of directory traversal bugs.
Also relax logic around generating display names to allow any
extension which maps to the requested MIME type. Tests to verify.
Bug:
18512473,
18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
Akira Numata [Tue, 25 Nov 2014 08:50:12 +0000 (17:50 +0900)]
APK still has privileged flag after being moved from "/system/priv-app"
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.
(cherry picked from commit
76bf60ead8132b86436ebbba40eaa8f2c8bbe812)
Change-Id: I39feeac7ece89c28045d196ae69fc974b1c6510b
Geoff Mendal [Mon, 1 Dec 2014 17:31:28 +0000 (17:31 +0000)]
am
6ca3ba73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
6ca3ba73b78be57dd50fe5813f076b3e166cc659':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 17:26:18 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 17:24:52 +0000 (09:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d79c516d1b137f23ec8f4178d156f9bc0f57676
Auto-generated-cl: translation import
Jason Monk [Fri, 21 Nov 2014 16:08:55 +0000 (11:08 -0500)]
SysUI: QS Wifi get connected wifi rssi from NC
Get the connected rssi for WiFi QS panel from NetworkController to
ensure it matches the status bar/QS.
Bug:
18479823
Change-Id: I82ca0cc9169a91b4e0ae6f07008d48fdb7b820f0
John Spurlock [Mon, 1 Dec 2014 17:11:21 +0000 (17:11 +0000)]
am
21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
* commit '
21d68f4808db02aa3252ba5dec8b0220d053cab3':
Volume: Improve inline volume controls used in settings.
John Spurlock [Mon, 1 Dec 2014 17:06:12 +0000 (17:06 +0000)]
Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev
Ihab Awad [Mon, 1 Dec 2014 16:29:35 +0000 (16:29 +0000)]
am
6cacf44e: Merge "Telecom API updates (1/6)" into lmp-mr1-dev
* commit '
6cacf44e7ecfe50097adc99dab97c3fb9770a1af':
Telecom API updates (1/6)
Ihab Awad [Mon, 1 Dec 2014 16:24:16 +0000 (16:24 +0000)]
Merge "Telecom API updates (1/6)" into lmp-mr1-dev
Chet Haase [Mon, 1 Dec 2014 15:58:46 +0000 (15:58 +0000)]
am
21871444: Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
* commit '
2187144408dbdb5322a2212fa2e68a5891ea60ca':
Zero duration animations snap to end value when started
Chet Haase [Mon, 1 Dec 2014 15:52:58 +0000 (15:52 +0000)]
Merge "Zero duration animations snap to end value when started" into lmp-mr1-dev
Geoff Mendal [Mon, 1 Dec 2014 15:11:25 +0000 (15:11 +0000)]
am
3fbf3b93: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
3fbf3b939abbc681f6812a429e2b809358deb7c3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 15:10:35 +0000 (15:10 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 1 Dec 2014 15:09:47 +0000 (07:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5278b3f5da079c97f9aafd947fef96ae3248778
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 15:07:54 +0000 (15:07 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 15:04:02 +0000 (15:04 +0000)]
am
e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
* commit '
e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
Zen: Improve zen mode panel condition selection.
John Spurlock [Mon, 1 Dec 2014 15:03:57 +0000 (15:03 +0000)]
am
1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
* commit '
1a3af711ab6f811a6bc4e9211cb255721fb1847d':
Doze: Break out proxcheck stats by pulse reason.
John Spurlock [Mon, 1 Dec 2014 15:03:52 +0000 (15:03 +0000)]
am
26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev
* commit '
26a695d974f7ee3b32b8d65a44a42f804af8f01c':
Volume: Update remote volume icons.
Geoff Mendal [Mon, 1 Dec 2014 15:02:48 +0000 (07:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1475c76eb44b69ef727a11f409e7d938552ee26d
Auto-generated-cl: translation import
John Spurlock [Mon, 1 Dec 2014 14:59:03 +0000 (14:59 +0000)]
Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:58:36 +0000 (14:58 +0000)]
Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev
John Spurlock [Mon, 1 Dec 2014 14:58:16 +0000 (14:58 +0000)]
Merge "Volume: Update remote volume icons." into lmp-mr1-dev
Chet Haase [Mon, 1 Dec 2014 14:57:15 +0000 (06:57 -0800)]
Zero duration animations snap to end value when started
A recent change to seeking behavior altered the logic of
setCurrentPlayTime() (which is called when animations are first
started) to set the current animated fraction to 0 for 0-duration
animations. This fix ensures that 0-duration animations snap to
their end value (fraction == 1) instead, matching the behavior
prior to the seeking fix.
Issue #
18542543 Animations with 0 duration stay in initial state when calling setCurrentPlayTime(0)
Change-Id: I9916d962cf46453a9e3e1207f58baf16f4a5830a
Geoff Mendal [Mon, 1 Dec 2014 14:52:53 +0000 (14:52 +0000)]
am
9cde3e1d: (-s ours) Import translations. DO NOT MERGE
* commit '
9cde3e1d82f65eaf73ccf92f14b101e600ef8e18':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Dec 2014 14:40:31 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 1 Dec 2014 14:36:32 +0000 (06:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
Wally Yau [Mon, 1 Dec 2014 13:13:54 +0000 (13:13 +0000)]
am
da392904: Set stream volume to max when userMasterVolume is set to true.
* commit '
da39290460b30e5080769f039d6dff352b3c7808':
Set stream volume to max when userMasterVolume is set to true.
John Spurlock [Sat, 29 Nov 2014 18:22:21 +0000 (13:22 -0500)]
Zen: Improve zen mode panel condition selection.
- Decouple condition requests from expansion, now
pre-request when zen panel unhidden.
- Animate zen mode panel expansion.
- Improve default selection logic, ensure something
is selected as soon as we are in the expanded state.
- Tweak visual spacing.
- Map null condition to Indef properly when we start
out in zen.
- Avoid unnecessary condition teardown when the conditions
are updated but unchanged from current.
- Cap number of optional conditions to display, default=3.
Bug:
18335618
Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
John Spurlock [Sat, 29 Nov 2014 16:33:49 +0000 (11:33 -0500)]
Doze: Break out proxcheck stats by pulse reason.
Enumerate all possible reasons for doze pulses, and subdivide
the proxcheck stats (near/far) by reason. Include reason in
doze log when starting a pulse.
Bug:
18373928
Change-Id: I4ebc2df082f51d47e3b2f0cb3999faeb582ef8dc
Ihab Awad [Wed, 12 Nov 2014 21:41:16 +0000 (13:41 -0800)]
Telecom API updates (1/6)
Bug:
18292176
Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
Wally Yau [Fri, 28 Nov 2014 20:40:30 +0000 (12:40 -0800)]
Set stream volume to max when userMasterVolume is set to true.
When useMasterVolume is set, we don't want to apply the volume
attenuation twice, once at the stream mixer and once at the master
volume control. It should only be applied once at the master volume
control.
Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0
Fixed: b/
18460548
John Spurlock [Fri, 28 Nov 2014 20:29:21 +0000 (15:29 -0500)]
Volume: Improve inline volume controls used in settings.
- Make the system internal ringer mode change signal available to
other system components via a standard intent, instead of a
volume-controller-only binder call.
- Update sysui to use new intent for icon policy.
- Add proper muting state to the volumizer, to look more like
the associated volume panel slider.
- Add basic ringer mode state tracking for the notification-ring
slider setting.
Bug:
17899613
Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
Elliott Hughes [Thu, 27 Nov 2014 19:02:59 +0000 (19:02 +0000)]
am
07b4a291: am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
07b4a291319ec48a272451789ab0fbbf8d55a050':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:57:00 +0000 (18:57 +0000)]
am
3e2848d2: am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
3e2848d249cafbf1cc79b600eab9bce055adcf8e':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:49:58 +0000 (18:49 +0000)]
am
8fc88562: am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
8fc8856268218fbd286eeb0b2f34eec23cb74f8c':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Thu, 27 Nov 2014 18:41:15 +0000 (18:41 +0000)]
am
85e21bd5: Mention ProGuard in the JNI documentation.
* commit '
85e21bd534d38f8de12e8229865a863f32c30e7a':
Mention ProGuard in the JNI documentation.
Elliott Hughes [Tue, 25 Nov 2014 19:18:43 +0000 (11:18 -0800)]
Mention ProGuard in the JNI documentation.
(cherry picked from commit
8e1bbfe0f1e4dac35b20972a71656e4c9bf437a1)
Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
Adrian Roos [Thu, 27 Nov 2014 13:06:00 +0000 (13:06 +0000)]
am
09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev
* commit '
09eeab7cbffae64add657f1a1e7ab6c7f20b6d9b':
Fix projection permission dialog layering
Adrian Roos [Thu, 27 Nov 2014 13:00:59 +0000 (13:00 +0000)]
Merge "Fix projection permission dialog layering" into lmp-mr1-dev
Geoff Mendal [Thu, 27 Nov 2014 10:18:58 +0000 (10:18 +0000)]
am
7028dec6: (-s ours) am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
7028dec6ca10cdc63966dad01e59cdbabd6a0a1d':
Import translations. DO NOT MERGE
Scott Main [Thu, 27 Nov 2014 10:18:52 +0000 (10:18 +0000)]
am
4a45a441: am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
4a45a44152c965363a4689befdcbd57177e48831':
docs:advmgr-updates
smain@google.com [Thu, 27 Nov 2014 10:18:47 +0000 (10:18 +0000)]
am
576e248f: am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
576e248f3ca32576ed3c37dadf6a4f90dc6b4f59':
define height for context images to avoid content jumps on load
Narayan Kamath [Thu, 27 Nov 2014 10:09:46 +0000 (10:09 +0000)]
am
1d184ace: resolved conflicts for merge of
7377998d to lmp-mr1-dev
* commit '
1d184acefa7105592134edebf7de4d77843d5791':
Be increasingly aggressive about fstrim if it isn't being run
Geoff Mendal [Thu, 27 Nov 2014 10:09:40 +0000 (10:09 +0000)]
am
022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '
022f4277c468176d43d4ed1cc12898e33ed1a502':
Import translations. DO NOT MERGE
Scott Main [Thu, 27 Nov 2014 10:08:51 +0000 (10:08 +0000)]
am
2995bd80: am
5a27b4b8: am
fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '
2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
docs:advmgr-updates
smain@google.com [Thu, 27 Nov 2014 10:08:45 +0000 (10:08 +0000)]
am
277fb8fd: am
d3c17270: am
3a4b011c: define height for context images to avoid content jumps on load
* commit '
277fb8fdaeb546119bc31269425edc72b75e87dd':
define height for context images to avoid content jumps on load
Narayan Kamath [Thu, 27 Nov 2014 09:57:35 +0000 (09:57 +0000)]
resolved conflicts for merge of
7377998d to lmp-mr1-dev
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
Amit Mahajan [Thu, 27 Nov 2014 03:11:57 +0000 (03:11 +0000)]
am
4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
* commit '
4ebd1e42a78dcb0ee219548b89f3733320bbc029':
Change to use DATA_ROAMING setting correctly with subId.
Amit Mahajan [Thu, 27 Nov 2014 03:05:45 +0000 (03:05 +0000)]
Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
Eino-Ville Talvala [Thu, 27 Nov 2014 00:27:36 +0000 (00:27 +0000)]
am
9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit '
9b35b801fb90e31c1dff5535715e505f3a1e26fb':
CameraManager: Separate service listener into a singleton
Eino-Ville Talvala [Thu, 27 Nov 2014 00:23:40 +0000 (00:23 +0000)]
Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
Alan Viverette [Thu, 27 Nov 2014 00:08:58 +0000 (16:08 -0800)]
Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
BUG:
18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
Eric Laurent [Wed, 26 Nov 2014 23:56:43 +0000 (23:56 +0000)]
am
563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
* commit '
563e61f5d06aca653894cecc2977bac70b08227c':
AudioRecord JNI: pass attributes to native AudioRecord.
Eric Laurent [Wed, 26 Nov 2014 23:52:06 +0000 (23:52 +0000)]
Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:46:44 +0000 (23:46 +0000)]
am
3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit '
3caf0f8e440fcc9947b8b153464ccdbc62640c97':
Add string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:42:52 +0000 (23:42 +0000)]
Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
Jeff Davidson [Wed, 26 Nov 2014 23:27:02 +0000 (15:27 -0800)]
Add string for "Connected via Wi-Fi assistant".
Bug:
18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
Jeremy Joslin [Wed, 26 Nov 2014 22:24:15 +0000 (14:24 -0800)]
Fix the ordering of extra values in the PI.
Bug:
18539720
Change-Id: I6bb69394b05923ca25bc1b4902bc2540a13812bd
Eino-Ville Talvala [Wed, 22 Oct 2014 21:39:31 +0000 (14:39 -0700)]
CameraManager: Separate service listener into a singleton
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.
This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.
Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.
Bug:
18077200
Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
Wale Ogunwale [Thu, 20 Nov 2014 19:42:38 +0000 (11:42 -0800)]
Added unique id to display devices and their settings.
The display setting saved to disk were using a localized name for
the key. This is an issue if the user changes languages after the
display settings have been saved. We now use the non-localized
name for the display to access the settings if it is available,
else we fall back on the localized name.
Bug:
18190800
Change-Id: I837c06a8935df10727229a1aa2bb6eeb3953707f
Jinsuk Kim [Wed, 26 Nov 2014 21:33:23 +0000 (21:33 +0000)]
am
bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit '
bc3226e21dfe881bf1ccae62e10b660d97b2b232':
Do not perform forceVolumeControlStream in master volume mode
Jinsuk Kim [Wed, 26 Nov 2014 21:27:16 +0000 (21:27 +0000)]
Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev