OSDN Git Service
Wale Ogunwale [Thu, 24 Sep 2015 16:59:06 +0000 (16:59 +0000)]
Merge "Drop additional input events to TaskPositioner when drag has ended."
Abodunrinwa Toki [Wed, 16 Sep 2015 18:47:38 +0000 (19:47 +0100)]
Reduce delay of floating toolbar appearance.
Bug:
21956394
Change-Id: Ide7ee2daffbf618b0a483c377032bf25b20d5b8e
Michael Wright [Thu, 24 Sep 2015 16:27:33 +0000 (16:27 +0000)]
Merge "Make android.hardware.usb.action.USB_ACCESSORY_DETACHED..."
Wale Ogunwale [Thu, 24 Sep 2015 15:28:27 +0000 (15:28 +0000)]
Merge "Make home stack move like another stack."
Michael Wright [Mon, 21 Sep 2015 14:41:24 +0000 (15:41 +0100)]
Make android.hardware.usb.action.USB_ACCESSORY_DETACHED...
a protected broadcast.
The broadcast "android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
was accidentally included twice, changed the extra copy to
"android.hardware.usb.action.USB_ACCESSORY_DETACHED".
Bug:
24188595
Change-Id: I8863c336f70796b2a15633595648b594864e84e2
Ryo Hashimoto [Thu, 24 Sep 2015 06:22:00 +0000 (06:22 +0000)]
Merge "Use the proper variant of String#substring to report broken strict mode stacks"
Vinit Deshpande [Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +0000)]
am
64f6236c: am
2bc3ff3c: am
de02fe2a: am
629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit '
64f6236cdd76c4539fea9c8fb19b2f0c981a01d3':
Disable wifi firmware logging by default
Erik Kline [Thu, 24 Sep 2015 04:33:25 +0000 (04:33 +0000)]
Merge "Refactor netlink and IpReachabilityMonitor into services/net"
Vinit Deshpande [Thu, 24 Sep 2015 04:26:03 +0000 (04:26 +0000)]
am
2bc3ff3c: am
de02fe2a: am
629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit '
2bc3ff3cf6b692a4bd69d75cb3e11fc0b0b063fe':
Disable wifi firmware logging by default
Jorim Jaggi [Thu, 24 Sep 2015 04:18:01 +0000 (04:18 +0000)]
am
8ba8c543: am
b278ea0c: am
27f26df6: am
05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '
8ba8c543f77eb8d5abad2653c5a6ebaeccc3a241':
Update message in SIM PIN view when configuration changes
Vinit Deshpande [Thu, 24 Sep 2015 04:17:40 +0000 (04:17 +0000)]
am
de02fe2a: am
629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit '
de02fe2afdc835eca72bb05a1514daa439bb2b40':
Disable wifi firmware logging by default
Vinit Deshpande [Thu, 24 Sep 2015 04:05:26 +0000 (04:05 +0000)]
am
629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit '
629909e02b97796ff0b79dbd03c2e72dd3d1e6bb':
Disable wifi firmware logging by default
Wale Ogunwale [Thu, 24 Sep 2015 04:04:21 +0000 (21:04 -0700)]
Drop additional input events to TaskPositioner when drag has ended.
Fixes issue where we do additional drag ended processing like moving
a task to a docked stack even though we have already done that from
the previous drag end.
Change-Id: Iab10f183a9eb0ec63d8303d1e991a9de65a86c34
Vinit Deshpande [Thu, 24 Sep 2015 03:58:38 +0000 (03:58 +0000)]
Merge "Disable wifi firmware logging by default" into mnc-dr-dev
Erik Kline [Mon, 10 Aug 2015 04:28:50 +0000 (13:28 +0900)]
Refactor netlink and IpReachabilityMonitor into services/net
- netlink from core to services/net/netlink
- IpReachabilityMonitor from core to services/net/ip
Change-Id: I45ac3f591bade45dd5ec441111b02b621234c0e4
Wale Ogunwale [Wed, 23 Sep 2015 22:40:07 +0000 (15:40 -0700)]
Make home stack move like another stack.
Previously the home stack was either positioned at the top or bottom
of the stack list. This type of movement was okay when there was mainly
2 stacks (home and app), but doesn't work in all cases where we have
multiple stacks.
For example:
1. Launch any activity in the freeform stack
2. Press the home button
3. Launch a translucent or dialog activity
In this case you would except the home stack to be seen behind the
translucent activity since that is the stack the user is coming from,
but you see the freeform stack instead since the home stack was moved
to the bottom of all stacks when the translucent activity was launched.
We no longer move the home stack to the bottom when a new
activity/task/stack comes to the front.
Bug:
23626353
Change-Id: Ic506acc8528e63b8e7f999dd88a450bee6fb4552
Jorim Jaggi [Thu, 24 Sep 2015 02:41:36 +0000 (02:41 +0000)]
am
b278ea0c: am
27f26df6: am
05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '
b278ea0cab555f16d0d8278ee3eadf75c6266920':
Update message in SIM PIN view when configuration changes
Jorim Jaggi [Thu, 24 Sep 2015 02:29:01 +0000 (02:29 +0000)]
am
27f26df6: am
05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '
27f26df629e7a5c2ea87ad46708dc4678c11d27a':
Update message in SIM PIN view when configuration changes
Jorim Jaggi [Thu, 24 Sep 2015 02:20:37 +0000 (02:20 +0000)]
am
05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '
05b11bf357be9546a2cbdd3f37c32fc9567f4767':
Update message in SIM PIN view when configuration changes
Wale Ogunwale [Thu, 24 Sep 2015 02:04:30 +0000 (02:04 +0000)]
Merge "Allow stacks behind a translucent fullscreen stack to be visible"
Wale Ogunwale [Thu, 24 Sep 2015 02:04:27 +0000 (02:04 +0000)]
Merge "Only place new task in focus stack if it is full screen stack."
Wale Ogunwale [Thu, 24 Sep 2015 02:04:22 +0000 (02:04 +0000)]
Merge "Don't resize task in current stack when moving it to a docked stack"
Blazej Magnowski [Thu, 24 Sep 2015 01:28:51 +0000 (01:28 +0000)]
Merge "Add HistoryEvaluator"
Jorim Jaggi [Thu, 24 Sep 2015 00:23:47 +0000 (00:23 +0000)]
Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
Vinit Deshpande [Wed, 23 Sep 2015 23:51:52 +0000 (16:51 -0700)]
Disable wifi firmware logging by default
This is really needed for debugging phase, which is over
now; and disabling it will reduce surface area
Bug:
24317401
Change-Id: I0acf9efc94333cb274d4286df9c853431d86883d
Deepanshu Gupta [Wed, 23 Sep 2015 23:26:52 +0000 (23:26 +0000)]
am
e5346dca: am
51a05d74: Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
* commit '
e5346dca479ecf87d5a3e412307e5f7ebe28ccb9':
Fix TypedArray.getTextArray()
Deepanshu Gupta [Wed, 23 Sep 2015 23:17:22 +0000 (23:17 +0000)]
am
51a05d74: Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
* commit '
51a05d74a81aeb334ef095fc6f1aa98e5163763f':
Fix TypedArray.getTextArray()
Deepanshu Gupta [Wed, 23 Sep 2015 23:05:06 +0000 (23:05 +0000)]
Merge "Fix TypedArray.getTextArray()" into mnc-ub-dev
Deepanshu Gupta [Wed, 23 Sep 2015 22:57:43 +0000 (15:57 -0700)]
Fix TypedArray.getTextArray()
Change-Id: Ic55b52840892fbf2a4258ba97ed31ca0283da8ed
Steve McKay [Wed, 23 Sep 2015 22:41:49 +0000 (22:41 +0000)]
Merge "Merge BROWSE and BROWSE_ALL actions."
Filip Gruszczynski [Wed, 23 Sep 2015 21:59:15 +0000 (21:59 +0000)]
Merge "Showing docked stack divider window."
Filip Gruszczynski [Tue, 22 Sep 2015 00:57:57 +0000 (17:57 -0700)]
Showing docked stack divider window.
When there is docked stack, we want to show a "handle" through which the
user will resize the docked stack. We add it from the system process,
because we want to avoid IPC calls.
Change-Id: If15fd2a0fcb7077446d1ba6c533acb3028a42039
Alan Viverette [Wed, 23 Sep 2015 20:05:35 +0000 (20:05 +0000)]
Merge "End switch thumb animator if it's been started"
Winson Chung [Wed, 23 Sep 2015 20:00:01 +0000 (20:00 +0000)]
Merge "Fixing crash in configuration change for secondary users."
Jorim Jaggi [Wed, 23 Sep 2015 19:53:00 +0000 (19:53 +0000)]
am
93d1a17b: am
1af3c6f4: am
1bcb3472: am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
93d1a17bafd51daaf6ed7fc56c7c3e84c5c119df':
Do not go over handler to dispatch keyguard visibility
Todd Kennedy [Wed, 23 Sep 2015 19:52:36 +0000 (19:52 +0000)]
am
1c9a9a20: am
8faa9e9e: am
898e6973: am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
1c9a9a20c35464d8a6554a2becff0f8acfb9c5b2':
save "retain loader" state
Paul Jensen [Wed, 23 Sep 2015 19:52:00 +0000 (19:52 +0000)]
am
6ae227e2: am
a2e47e2f: am
d737f715: am
4b7b8117: am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
6ae227e27fcab0a454ac45b897843bfceaa09c69':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 19:51:53 +0000 (19:51 +0000)]
am
f86347f5: am
88674941: am
6a728e17: am
83ce299c: am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
f86347f54d0da443172713db0f6fc145ca5b19ff':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 19:51:46 +0000 (19:51 +0000)]
am
4d1b3fda: (-s ours) am
1584eefe: (-s ours) am
eb1e4b14: (-s ours) am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4d1b3fda4343e026b2ec80689f5747744cc86692':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 19:51:39 +0000 (19:51 +0000)]
am
0882771d: (-s ours) am
b89ac616: (-s ours) am
981c592d: (-s ours) am
18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
0882771d196468efad1e5350d0ba163c11e20b92':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 19:51:32 +0000 (19:51 +0000)]
am
ed8ba7f9: (-s ours) am
68aefeeb: (-s ours) am
c31d6b70: (-s ours) am
d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
ed8ba7f90b42303deca05d396857aec032a880c8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 19:51:24 +0000 (19:51 +0000)]
am
c8d2fa3c: (-s ours) am
43c9b3ee: (-s ours) am
a58143b4: (-s ours) am
a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c8d2fa3c2e8d957cf84ef543a2bcd3d9778cc0e3':
Import translations. DO NOT MERGE
Winson [Wed, 23 Sep 2015 19:44:33 +0000 (12:44 -0700)]
Fixing crash in configuration change for secondary users.
- The crash is a regression caused by ag/773159.
Baligh Uddin [Wed, 23 Sep 2015 19:51:14 +0000 (19:51 +0000)]
am
651a1403: (-s ours) am
16bea03a: (-s ours) am
0b97b8cf: (-s ours) am
64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
651a14033e14b0868eb5b5508d4943396a7761b9':
Import translations. DO NOT MERGE
Wale Ogunwale [Wed, 23 Sep 2015 05:08:37 +0000 (22:08 -0700)]
Allow stacks behind a translucent fullscreen stack to be visible
Stacks behind the fullscreen stack with a translucent activity
are always visible so they can act as a backdrop to the translucent
activity.
Bug:
23626353
Change-Id: I3d76ae6bedbba90736706474dcab53d75b60304a
Steve McKay [Wed, 16 Sep 2015 22:07:31 +0000 (15:07 -0700)]
Merge BROWSE and BROWSE_ALL actions.
Open Files app when exploring from settings.
Force visibility of file size in this mode.
Don't hide empty media providers.
Bug:
24136618,
24140864
Change-Id: I6f238586725f9b6255812e3082bb8d8655219a7d
Jorim Jaggi [Wed, 23 Sep 2015 19:12:41 +0000 (19:12 +0000)]
am
1af3c6f4: am
1bcb3472: am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
1af3c6f401da0ab8c4ddefd3e1776f9be50a1389':
Do not go over handler to dispatch keyguard visibility
Jan Nordqvist [Wed, 23 Sep 2015 19:05:53 +0000 (19:05 +0000)]
Merge "Hotspot 2.0 relase 2 first cut."
Jorim Jaggi [Wed, 23 Sep 2015 19:03:26 +0000 (19:03 +0000)]
am
1bcb3472: am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
1bcb3472669529edc991a31e6cbf7866a385383e':
Do not go over handler to dispatch keyguard visibility
Blazej Magnowski [Thu, 17 Sep 2015 22:14:29 +0000 (15:14 -0700)]
Add HistoryEvaluator
Adds the possibility to store the evaluations for previous strokes and gestures.
Also and enables to take the history into account when classifying current
interatcions.
Change-Id: Ia8fa54a00daa80b4e5aebf11b11b568ed23165d4
Jorim Jaggi [Wed, 23 Sep 2015 18:55:38 +0000 (18:55 +0000)]
am
6a15d528: Do not go over handler to dispatch keyguard visibility
* commit '
6a15d528c0a4501389008ef945dec38b5ca6919a':
Do not go over handler to dispatch keyguard visibility
Jorim Jaggi [Wed, 23 Sep 2015 18:52:12 +0000 (11:52 -0700)]
Update message in SIM PIN view when configuration changes
Bug:
24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
Xiaohui Chen [Tue, 22 Sep 2015 22:29:31 +0000 (15:29 -0700)]
Cleanup USER_OWNER in activity and location services
Bug:
19913735
Change-Id: Ie2b7acb3fa53b1dcf7319de1eb5bdec585dbf78c
Xiaohui Chen [Tue, 22 Sep 2015 22:33:31 +0000 (15:33 -0700)]
Cleanup OWNER references.
Bug:
19913735
Change-Id: I2150c6baaab80fe11312e4401394a2a8da52e595
Xiaohui Chen [Tue, 22 Sep 2015 22:08:57 +0000 (15:08 -0700)]
Cleanup USER_OWNER in DPMS
This cl assumes device owner will continue running under user 0.
Bug:
19913735
Change-Id: I65c97f6f14fb362acbdcb6588b73787291100698
Jorim Jaggi [Tue, 22 Sep 2015 22:55:33 +0000 (15:55 -0700)]
Do not go over handler to dispatch keyguard visibility
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.
Bug:
24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
Todd Kennedy [Wed, 23 Sep 2015 18:30:57 +0000 (18:30 +0000)]
am
8faa9e9e: am
898e6973: am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
8faa9e9e349011aebab6527476e315f6a5f610e4':
save "retain loader" state
Alan Viverette [Wed, 23 Sep 2015 18:23:21 +0000 (14:23 -0400)]
End switch thumb animator if it's been started
Running implies that it's been started and the animation has actually
begun, which is not true if we call start() and then immediately try
to jump state.
Bug:
24273164
Change-Id: I7f8d856dbe925679dad082f1e28d8936ac2b04db
Todd Kennedy [Wed, 23 Sep 2015 18:12:03 +0000 (18:12 +0000)]
am
898e6973: am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
898e6973ca198f327059d331b4d83b1d183d5fb1':
save "retain loader" state
Todd Kennedy [Wed, 23 Sep 2015 18:05:58 +0000 (18:05 +0000)]
am
739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '
739bb7c694aee521995100c456cf1c8341820bec':
save "retain loader" state
Chris Craik [Wed, 23 Sep 2015 17:59:44 +0000 (17:59 +0000)]
Merge "Remove lookup3 gamma code"
Todd Kennedy [Wed, 23 Sep 2015 17:56:52 +0000 (17:56 +0000)]
Merge "save "retain loader" state" into mnc-dr-dev
Paul Jensen [Wed, 23 Sep 2015 17:53:09 +0000 (17:53 +0000)]
am
a2e47e2f: am
d737f715: am
4b7b8117: am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
a2e47e2fbc66eebef5cf94405518882158ac2b15':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 17:53:03 +0000 (17:53 +0000)]
am
88674941: am
6a728e17: am
83ce299c: am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
88674941e1cb506554e23d7f44170c5829094615':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 17:52:58 +0000 (17:52 +0000)]
am
1584eefe: (-s ours) am
eb1e4b14: (-s ours) am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1584eefebd2de1bcce0e589ee6414df4bade07b9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:52:52 +0000 (17:52 +0000)]
am
b89ac616: (-s ours) am
981c592d: (-s ours) am
18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
b89ac616a050fa5efd12c9d5e034bd8780d0446e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:52:45 +0000 (17:52 +0000)]
am
68aefeeb: (-s ours) am
c31d6b70: (-s ours) am
d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
68aefeeb50f4a72cd046f6ec2d4fdc8e42ed69bd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:52:40 +0000 (17:52 +0000)]
am
43c9b3ee: (-s ours) am
a58143b4: (-s ours) am
a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
43c9b3eeac59842e8c8accfcfe2ad8934dd1c4c1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:52:34 +0000 (17:52 +0000)]
am
16bea03a: (-s ours) am
0b97b8cf: (-s ours) am
64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
16bea03a44f53b42781933551abc1d68b3f2edd3':
Import translations. DO NOT MERGE
Paul Jensen [Wed, 23 Sep 2015 17:42:53 +0000 (17:42 +0000)]
am
d737f715: am
4b7b8117: am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
d737f715d1188abf89891f4c38308fee04ae2e73':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 17:42:46 +0000 (17:42 +0000)]
am
6a728e17: am
83ce299c: am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
6a728e1744749a6b27e22d696b5327909e57d126':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 17:42:40 +0000 (17:42 +0000)]
am
eb1e4b14: (-s ours) am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
eb1e4b14c979b36abbd6869ee300ec69936afb55':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:34 +0000 (17:42 +0000)]
am
981c592d: (-s ours) am
18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
981c592d2a6eaf3e43a8cab274fbcb4c58b99eab':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:28 +0000 (17:42 +0000)]
am
c31d6b70: (-s ours) am
d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:22 +0000 (17:42 +0000)]
am
a58143b4: (-s ours) am
a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a58143b41ce92c425dbdc0abd6a6961cf571a083':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:42:16 +0000 (17:42 +0000)]
am
0b97b8cf: (-s ours) am
64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
0b97b8cf7954d76c5f6d6d21a7808bbcff524b99':
Import translations. DO NOT MERGE
Alan Viverette [Wed, 23 Sep 2015 17:39:08 +0000 (17:39 +0000)]
Merge "Add attribute for specifying initial ScaleDrawable level"
Paul Jensen [Wed, 23 Sep 2015 17:25:49 +0000 (17:25 +0000)]
am
4b7b8117: am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
4b7b81178482029f7f58d64cea8620574294ce78':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 17:25:45 +0000 (17:25 +0000)]
am
83ce299c: am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
83ce299c6a676819351985c379661ae1f98e806c':
Fix NOT_RESTRICTED network capability and enforce it.
Baligh Uddin [Wed, 23 Sep 2015 17:25:26 +0000 (17:25 +0000)]
am
9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9c5e49b713db3ddf12d90d8cff9c2e8191a3667d':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:22 +0000 (17:25 +0000)]
am
18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
18daf48f1af38a75c2fb2a67204fc0852121ade2':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:18 +0000 (17:25 +0000)]
am
d213d288: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d213d28807c07e7030ae506413fbb0d2c6a9c6b9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:08 +0000 (17:25 +0000)]
am
a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a6928d4d2673f38e4c4110f1d27537044540a7aa':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Sep 2015 17:25:04 +0000 (17:25 +0000)]
am
64f17a52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
64f17a522ab39bec570e96c6bab7442f6026b902':
Import translations. DO NOT MERGE
Evan Charlton [Wed, 23 Sep 2015 16:37:11 +0000 (09:37 -0700)]
Don't split the href across lines
This introduces untrimmed whitespace into the URL which causes an
infinite redirect loop when trying to load
/Geofence.Builder.%20%20%20%20.html
Bug:
20851763
Change-Id: I3dc670dc30e57f76403d1eeaf3a4ce50406b9d91
Steve McKay [Wed, 23 Sep 2015 15:53:52 +0000 (15:53 +0000)]
Merge "Eliminate bad type parameterization."
Steve McKay [Tue, 22 Sep 2015 23:37:03 +0000 (16:37 -0700)]
Eliminate bad type parameterization.
Change-Id: Id886098926f3c62583f34cfbcc04953bb2f4e8c3
Filip Gruszczynski [Wed, 23 Sep 2015 15:32:29 +0000 (15:32 +0000)]
Merge "Preserve windows during stack resize."
Jason Monk [Wed, 23 Sep 2015 15:21:32 +0000 (15:21 +0000)]
Merge "Always show full strength for wifi quick toggle"
Jason Monk [Wed, 23 Sep 2015 15:11:00 +0000 (11:11 -0400)]
Always show full strength for wifi quick toggle
Don't show status like connection strength and activity for the
wifi quick toggle.
Change-Id: Ifb104627c516d054862b432b6c6d6d4e114b4ade
Paul Jensen [Wed, 23 Sep 2015 14:50:45 +0000 (14:50 +0000)]
am
9971167f: am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
9971167fbe7f3b356ba7fd89d91271376a56d235':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 14:50:40 +0000 (14:50 +0000)]
am
62bb1897: am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
62bb18976f3a79405897bf44bdec8f0abd855b9f':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 14:42:02 +0000 (14:42 +0000)]
am
5ebe8e26: am
4cbfe331: am
773d71e7: am
962c3a0f: am
ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '
5ebe8e26f2c9517ce321a0fbcbed6efe2960da47':
Don't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)]
am
554cecea: (-s ours) am
10a7d744: am
96cd7c14: am
635f8711: am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
554cecea4c5e39c25efb721258366ce12e6b861c':
Fix NOT_RESTRICTED network capability and enforce it.
Alan Viverette [Wed, 23 Sep 2015 14:20:59 +0000 (10:20 -0400)]
Add attribute for specifying initial ScaleDrawable level
Bug:
19182305
Change-Id: Ic1f183db6183017352babc6dc190fdb9124c285a
Baligh Uddin [Wed, 23 Sep 2015 14:15:57 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:31 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:15:25 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:25 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Wed, 23 Sep 2015 14:12:06 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev