OSDN Git Service
David Braun [Thu, 13 Mar 2014 18:30:11 +0000 (18:30 +0000)]
am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
Add string parameter order to default SMS dialog text
David Braun [Thu, 13 Mar 2014 18:20:48 +0000 (11:20 -0700)]
Add string parameter order to default SMS dialog text
Bug:
13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
Baligh Uddin [Thu, 13 Mar 2014 16:40:31 +0000 (16:40 +0000)]
am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Mar 2014 19:02:29 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
Baligh Uddin [Tue, 11 Mar 2014 17:41:25 +0000 (17:41 +0000)]
am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
14b82fd73f59f51dffee9562057ab747f12134d3':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 11 Mar 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:15:28 +0000 (02:15 +0000)]
am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Tue, 11 Mar 2014 02:15:27 +0000 (02:15 +0000)]
am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
d43d5becb359cfdd5e30f691724739ab216011f0':
DO NOT MERGE Remove extra fragment in captioning preferences
Alan Viverette [Tue, 11 Mar 2014 02:11:52 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:11:41 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
Baligh Uddin [Mon, 10 Mar 2014 22:28:38 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
Wei Wang [Sat, 8 Mar 2014 02:02:19 +0000 (02:02 +0000)]
am
104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
* commit '
104eea0b97c63b97040dc26ddf3635257e1b19a2':
DO NOT MERGE Change bluetooth off display message.
Wei Wang [Sat, 8 Mar 2014 02:00:36 +0000 (02:00 +0000)]
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
Alan Viverette [Fri, 7 Mar 2014 22:06:29 +0000 (14:06 -0800)]
DO NOT MERGE Add preference for caption text opacity
BUG:
11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
Alan Viverette [Fri, 7 Mar 2014 22:06:07 +0000 (14:06 -0800)]
DO NOT MERGE Remove extra fragment in captioning preferences
BUG:
11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
Rob Fletcher [Thu, 6 Mar 2014 21:59:31 +0000 (21:59 +0000)]
am
549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
* commit '
549a39b49510dad27da588714f848dc891913239':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
Bug:
12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
Wei Wang [Mon, 3 Mar 2014 22:58:54 +0000 (14:58 -0800)]
DO NOT MERGE Change bluetooth off display message.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
Baligh Uddin [Thu, 20 Feb 2014 20:56:19 +0000 (20:56 +0000)]
am
d83484db: (-s ours) Import translations. DO NOT MERGE
* commit '
d83484dba0749e01cf80a85cd0d2648a79f9fdf4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 15:23:08 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
Amith Yamasani [Wed, 5 Feb 2014 20:37:21 +0000 (20:37 +0000)]
am
3c4603ef: am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3c4603ef1c19510bd4a58aee19935e084603c69b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:35:24 +0000 (20:35 +0000)]
am
8f948217: am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:33:48 +0000 (12:33 -0800)]
am
c68a6bde: am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 20:30:42 +0000 (12:30 -0800)]
am
0ad77445: am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0ad774458a627cc4608c717a7efdadf2404d973c':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am
7c0ada65: am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am
3f722079: am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am
1ba09366: am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am
0fce6123: am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am
7a2d8bd4: am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am
49d502a4: am
c7843db0: Remove unused DebugIntentSender
* commit '
49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am
c7843db0: Remove unused DebugIntentSender
* commit '
c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender
Bug:
12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit
26430486e4082c89e31a9489e4309566bda2fec8)
Baligh Uddin [Tue, 7 Jan 2014 05:04:29 +0000 (21:04 -0800)]
am
6b8a7116: (-s ours) Import translations. DO NOT MERGE
* commit '
6b8a7116a2203b32cff432fd1602cc3e186b2608':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 02:46:29 +0000 (18:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
Baligh Uddin [Tue, 31 Dec 2013 00:41:18 +0000 (16:41 -0800)]
am
0ae418b2: (-s ours) Import translations. DO NOT MERGE
* commit '
0ae418b207f37bbc9ed4b0be267054f8244dc70a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 23:09:59 +0000 (15:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
Baligh Uddin [Fri, 27 Dec 2013 03:51:27 +0000 (19:51 -0800)]
am
0f952752: (-s ours) Import translations. DO NOT MERGE
* commit '
0f952752e387cd4035193015ff3fa793164c980c':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 00:26:39 +0000 (16:26 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Dec 2013 15:28:03 +0000 (07:28 -0800)]
am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
7ba72721134adeda10972f68fbcf74a491c6b11e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 06:12:01 +0000 (22:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 17 Dec 2013 17:33:32 +0000 (09:33 -0800)]
am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
1177cdec4eeeacc787059a7843ade6571f54ac5f':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Dec 2013 20:44:01 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
Baligh Uddin [Thu, 12 Dec 2013 15:46:25 +0000 (07:46 -0800)]
am
879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '
879cc42fb33f717f985e4627355c7735c78f16b3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 04:01:51 +0000 (20:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Dec 2013 20:10:52 +0000 (12:10 -0800)]
am
233d666a: (-s ours) Import translations. DO NOT MERGE
* commit '
233d666aee25e8a869fa923e1578ca4ff0a202e2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 19:47:45 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:29:27 +0000 (17:29 -0800)]
am
5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
* commit '
5d65a47c395918d3f777d99747eb4f2e901566ee':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:27:43 +0000 (01:27 +0000)]
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
Lance Jin-woong Chang [Thu, 5 Dec 2013 00:59:51 +0000 (00:59 +0000)]
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
This reverts commit
5796dad9a41e9801878f2cf0feb76977da4b025b.
Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
Lance Chang [Thu, 5 Dec 2013 00:49:45 +0000 (16:49 -0800)]
am
071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
* commit '
071fbfd3f35c01fb1c4052614902dabe16af691f':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
Lance Chang [Thu, 5 Dec 2013 00:47:14 +0000 (00:47 +0000)]
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug:
11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
Geoff Mendal [Wed, 4 Dec 2013 21:42:04 +0000 (13:42 -0800)]
am
3c29831e: (-s ours) Import translations. DO NOT MERGE
* commit '
3c29831e87bb131246e88aeb2b18d1fc11627e5d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Dec 2013 21:28:51 +0000 (13:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
Amith Yamasani [Tue, 3 Dec 2013 19:35:14 +0000 (11:35 -0800)]
am
72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '
72a7afb0935264586c821062279d39d8338b1e3d':
Put fragment in specific activity's whitelist
Amith Yamasani [Tue, 3 Dec 2013 19:33:21 +0000 (19:33 +0000)]
Merge "Put fragment in specific activity's whitelist" into klp-dev
Lance Chang [Tue, 3 Dec 2013 10:10:43 +0000 (19:10 +0900)]
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug:
11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
Geoff Mendal [Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)]
am
f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit '
f8e1829c99f1ad74131dad12e220b95a629cd9b5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Dec 2013 20:13:18 +0000 (12:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 27 Nov 2013 20:36:00 +0000 (12:36 -0800)]
am
b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit '
b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 27 Nov 2013 20:18:28 +0000 (12:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
Geoff Mendal [Mon, 25 Nov 2013 20:55:11 +0000 (12:55 -0800)]
am
d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit '
d82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:32:22 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
Amith Yamasani [Mon, 25 Nov 2013 19:10:00 +0000 (11:10 -0800)]
Put fragment in specific activity's whitelist
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
Geoff Mendal [Thu, 21 Nov 2013 22:07:57 +0000 (14:07 -0800)]
am
c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit '
c3bd608799f2239dfa8d739b2732954e4fd658e5':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 21 Nov 2013 20:40:04 +0000 (12:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import
Baligh Uddin [Wed, 20 Nov 2013 21:15:25 +0000 (13:15 -0800)]
am
f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit '
f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Nov 2013 19:27:32 +0000 (11:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
Jeff Brown [Tue, 19 Nov 2013 03:07:06 +0000 (19:07 -0800)]
am
130118d4: Add help url for remote display.
* commit '
130118d43628c058e3bf82f5d978d383f19390de':
Add help url for remote display.
Jeff Brown [Mon, 18 Nov 2013 20:26:16 +0000 (12:26 -0800)]
Add help url for remote display.
Bug:
11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
Baligh Uddin [Mon, 18 Nov 2013 19:15:12 +0000 (11:15 -0800)]
am
91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '
91c54aa81849fd60839ac62efb005df390c64438':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Nov 2013 19:02:58 +0000 (11:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:56:55 +0000 (11:56 -0800)]
am
beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
* commit '
beb9a03b716d152ea25813fca3a93a1ec781a685':
Remove hardcoded msgid. We have already leveraged in TC.
Baligh Uddin [Fri, 15 Nov 2013 19:52:40 +0000 (19:52 +0000)]
Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev
Baligh Uddin [Fri, 15 Nov 2013 19:42:56 +0000 (11:42 -0800)]
am
ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit '
ebf214892d020d9f310dd583e519bc3e1e8925cf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:31:33 +0000 (11:31 -0800)]
Import translations. DO NOT MERGE
bug:
11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Nov 2013 19:21:11 +0000 (11:21 -0800)]
Remove hardcoded msgid. We have already leveraged in TC.
bug:
11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
Baligh Uddin [Fri, 15 Nov 2013 19:11:55 +0000 (11:11 -0800)]
am
503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '
503b6deff226b12450decd5997111c77bd179a88':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Nov 2013 19:04:19 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Bug:
11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
Svetoslav [Fri, 15 Nov 2013 06:27:36 +0000 (22:27 -0800)]
am
e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev
* commit '
e7b781f574b8ec957d6254ed9edaef469c7085a5':
Show correct message for a print job that is being canceled.
Svetoslav [Fri, 15 Nov 2013 06:23:54 +0000 (06:23 +0000)]
Merge "Show correct message for a print job that is being canceled." into klp-dev
Svetoslav [Fri, 15 Nov 2013 02:15:15 +0000 (18:15 -0800)]
Show correct message for a print job that is being canceled.
1. If a print job is being canceled we now show appropriate
message that matches what the notification shows.
2. If a print job is being canceled we do not show the cancel
button.
bug:
11696928
Change-Id: I0fc4f8226c4aa9acd6a4b65811f4228e56018315
Jeff Brown [Fri, 15 Nov 2013 01:31:33 +0000 (17:31 -0800)]
am
36f98428: Merge "Update cast screen strings." into klp-dev
* commit '
36f98428d450226670d67123ce02cc0c0ca75621':
Update cast screen strings.
Jeff Brown [Fri, 15 Nov 2013 01:29:05 +0000 (01:29 +0000)]
Merge "Update cast screen strings." into klp-dev
Jim Miller [Fri, 15 Nov 2013 00:27:24 +0000 (16:27 -0800)]
am
fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit '
fb3d5cad48876dbd366fd8b562529d355d2428db':
Don't show keyguard on top of CryptKeeper
Jeff Brown [Fri, 15 Nov 2013 00:04:13 +0000 (16:04 -0800)]
Update cast screen strings.
Bug:
11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
Jim Miller [Thu, 14 Nov 2013 22:40:22 +0000 (14:40 -0800)]
Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug
11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
David Christie [Thu, 14 Nov 2013 20:16:06 +0000 (12:16 -0800)]
am
b1ded62f: Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
* commit '
b1ded62f3fd8afa2507fc8d284522019dc1e31e2':
Update power widget icons and fix location behavior Bug:
11242129
David Christie [Thu, 14 Nov 2013 20:12:41 +0000 (20:12 +0000)]
Merge "Update power widget icons and fix location behavior Bug:
11242129" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 02:33:06 +0000 (18:33 -0800)]
am
9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '
9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 02:06:51 +0000 (18:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
Jeff Brown [Wed, 13 Nov 2013 16:57:58 +0000 (08:57 -0800)]
am
81ed0438: Finalize assets for screen cast.
* commit '
81ed043857dadcb69885c1e2ac37d63925c56c65':
Finalize assets for screen cast.
Jeff Brown [Wed, 13 Nov 2013 06:04:49 +0000 (22:04 -0800)]
Finalize assets for screen cast.
Bug:
11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
Baligh Uddin [Mon, 11 Nov 2013 22:44:42 +0000 (14:44 -0800)]
am
622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Nov 2013 22:41:12 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 11 Nov 2013 18:35:06 +0000 (10:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
Jeff Brown [Mon, 11 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am
4e54c2a1: Integrate remote display routes into screen cast settings UI.
* commit '
4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
Integrate remote display routes into screen cast settings UI.
Jeff Brown [Mon, 11 Nov 2013 05:02:20 +0000 (21:02 -0800)]
Integrate remote display routes into screen cast settings UI.
Merged remote display route selection into the existing wifi
display preference UI. Moved the on/off toggle over to a menu item.
The preference page is now mainly implemented in terms of the
media router. It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.
This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.
Bug:
11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
Ed Heyl [Fri, 8 Nov 2013 21:31:32 +0000 (13:31 -0800)]
am
a27816dc: merge in release branch changes (no-op).
* commit '
a27816dc2d72f5757ee5377ccd03798736c96fd8':
Revert "Accessibility: filter touches to Enable button"
Ed Heyl [Fri, 8 Nov 2013 21:23:52 +0000 (13:23 -0800)]
merge in release branch changes (no-op).
David Christie [Thu, 31 Oct 2013 18:03:36 +0000 (11:03 -0700)]
Update power widget icons and fix location behavior
Bug:
11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820