Commit Graph

11745 Commits

Author SHA1 Message Date
Baligh Uddin
5fcebc78b9 am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
  Import translations. DO NOT MERGE
2013-12-12 07:46:25 -08:00
Baligh Uddin
879cc42fb3 Import translations. DO NOT MERGE
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
2013-12-11 20:01:51 -08:00
Baligh Uddin
c5e0893521 am 233d666a: (-s ours) Import translations. DO NOT MERGE
* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE
2013-12-09 12:10:52 -08:00
Baligh Uddin
233d666aee Import translations. DO NOT MERGE
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
2013-12-09 11:47:45 -08:00
Lance Jin-woong Chang
1f5e66392e 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"
2013-12-04 17:29:27 -08:00
Lance Jin-woong Chang
5d65a47c39 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 2013-12-05 01:27:46 +00:00
Lance Jin-woong Chang
0637c1f909 Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
This reverts commit 5796dad9a4.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5
2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b 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
2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3 Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev 2013-12-05 00:47:16 +00:00
Geoff Mendal
65c2a28505 am 3c29831e: (-s ours) Import translations. DO NOT MERGE
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
  Import translations. DO NOT MERGE
2013-12-04 13:42:04 -08:00
Geoff Mendal
3c29831e87 Import translations. DO NOT MERGE
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
2013-12-04 13:28:51 -08:00
Amith Yamasani
3d6ca11349 am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
  Put fragment in specific activity's whitelist
2013-12-03 11:35:14 -08:00
Amith Yamasani
72a7afb093 Merge "Put fragment in specific activity's whitelist" into klp-dev 2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4 Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-03 19:16:12 +09:00
Geoff Mendal
d6ea675c11 am f8e1829c: (-s ours) Import translations. DO NOT MERGE
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
  Import translations. DO NOT MERGE
2013-12-02 12:45:29 -08:00
Geoff Mendal
f8e1829c99 Import translations. DO NOT MERGE
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
2013-12-02 12:13:18 -08:00
Geoff Mendal
fa1df42735 am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
  Import translations. DO NOT MERGE
2013-11-27 12:36:00 -08:00
Geoff Mendal
b8fe3aa2ab Import translations. DO NOT MERGE
Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import
2013-11-27 12:18:28 -08:00
Geoff Mendal
c2d1fdac9e am d82e8f2b: (-s ours) Import translations. DO NOT MERGE
* commit 'd82e8f2bec1421c660c786f89e75ffcc4a6fd11e':
  Import translations. DO NOT MERGE
2013-11-25 12:55:11 -08:00
Geoff Mendal
d82e8f2bec Import translations. DO NOT MERGE
Change-Id: I0a14a545804964011401d47a44bb6a3d0de94a08
Auto-generated-cl: translation import
2013-11-25 11:32:22 -08:00
Amith Yamasani
a88bdd34f7 Put fragment in specific activity's whitelist
Change-Id: I782dc8ec29e49a834832dc8357b3fdb12846e8a9
2013-11-25 11:10:00 -08:00
Geoff Mendal
548614a4e6 am c3bd6087: (-s ours) Import translations. DO NOT MERGE
* commit 'c3bd608799f2239dfa8d739b2732954e4fd658e5':
  Import translations. DO NOT MERGE
2013-11-21 14:07:57 -08:00
Geoff Mendal
c3bd608799 Import translations. DO NOT MERGE
Change-Id: I8863a00a23acee9b961b5bf1a0f082ffe5c7b3a1
Auto-generated-cl: translation import
2013-11-21 12:40:04 -08:00
Baligh Uddin
cd0726f7d8 am f06ce4eb: (-s ours) Import translations. DO NOT MERGE
* commit 'f06ce4eb9668415c23b16dbd7d8c50702466f8c4':
  Import translations. DO NOT MERGE
2013-11-20 13:15:25 -08:00
Baligh Uddin
f06ce4eb96 Import translations. DO NOT MERGE
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
2013-11-20 11:27:32 -08:00
Jeff Brown
017d2a189a am 130118d4: Add help url for remote display.
* commit '130118d43628c058e3bf82f5d978d383f19390de':
  Add help url for remote display.
2013-11-18 19:07:06 -08:00
Jeff Brown
130118d436 Add help url for remote display.
Bug: 11736504
Change-Id: I83d278731cf853ff911ff1a8b82a942881cb4727
2013-11-18 17:58:08 -08:00
Baligh Uddin
6d34b6988b am 91c54aa8: (-s ours) Import translations. DO NOT MERGE
* commit '91c54aa81849fd60839ac62efb005df390c64438':
  Import translations. DO NOT MERGE
2013-11-18 11:15:12 -08:00
Baligh Uddin
91c54aa818 Import translations. DO NOT MERGE
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
2013-11-18 11:02:58 -08:00
Baligh Uddin
9c8a463c30 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.
2013-11-15 11:56:55 -08:00
Baligh Uddin
beb9a03b71 Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev 2013-11-15 19:52:41 +00:00
Baligh Uddin
72d674af97 am ebf21489: (-s ours) Import translations. DO NOT MERGE
* commit 'ebf214892d020d9f310dd583e519bc3e1e8925cf':
  Import translations. DO NOT MERGE
2013-11-15 11:42:56 -08:00
Baligh Uddin
ebf214892d Import translations. DO NOT MERGE
bug:11696928
Change-Id: I500d2c96aef949f30d9fbabf2777563e9e68dbe6
Auto-generated-cl: translation import
2013-11-15 19:37:56 +00:00
Baligh Uddin
e62490c3be Remove hardcoded msgid. We have already leveraged in TC.
bug:11696928
Change-Id: I71beb961ff73902cf5a67c5de1175db30eaa0871
2013-11-15 11:21:11 -08:00
Baligh Uddin
67a0472f3f am 503b6def: (-s ours) Import translations. DO NOT MERGE
* commit '503b6deff226b12450decd5997111c77bd179a88':
  Import translations. DO NOT MERGE
2013-11-15 11:11:55 -08:00
Baligh Uddin
503b6deff2 Import translations. DO NOT MERGE
Bug: 11696928
Change-Id: I23f78d9fb53fd5da325f121bac78ac60a9c78bb6
Auto-generated-cl: translation import
2013-11-15 19:06:28 +00:00
Svetoslav
196bc5c63a 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.
2013-11-14 22:27:36 -08:00
Svetoslav
e7b781f574 Merge "Show correct message for a print job that is being canceled." into klp-dev 2013-11-15 06:23:54 +00:00
Svetoslav
97e962cd36 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
2013-11-14 18:15:19 -08:00
Jeff Brown
8174aad503 am 36f98428: Merge "Update cast screen strings." into klp-dev
* commit '36f98428d450226670d67123ce02cc0c0ca75621':
  Update cast screen strings.
2013-11-14 17:31:33 -08:00
Jeff Brown
36f98428d4 Merge "Update cast screen strings." into klp-dev 2013-11-15 01:29:05 +00:00
Jim Miller
31ee7e19a0 am fb3d5cad: Don\'t show keyguard on top of CryptKeeper
* commit 'fb3d5cad48876dbd366fd8b562529d355d2428db':
  Don't show keyguard on top of CryptKeeper
2013-11-14 16:27:24 -08:00
Jeff Brown
b960c74673 Update cast screen strings.
Bug: 11257292
Change-Id: I280f99bb91ebd0badd06b7fdca25aa3f2e96d201
2013-11-14 16:04:13 -08:00
Jim Miller
fb3d5cad48 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
2013-11-14 14:40:22 -08:00
David Christie
7ff9f2b488 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
2013-11-14 12:16:06 -08:00
David Christie
b1ded62f3f Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev 2013-11-14 20:12:42 +00:00
Baligh Uddin
2f888a4752 am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE
* commit '9b28d5a0c3a6ac46a55a5c8c3b10791494fd61c5':
  Import translations. DO NOT MERGE
2013-11-13 18:33:06 -08:00
Baligh Uddin
9b28d5a0c3 Import translations. DO NOT MERGE
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
2013-11-13 18:06:51 -08:00
Jeff Brown
3aedfdfdbf am 81ed0438: Finalize assets for screen cast.
* commit '81ed043857dadcb69885c1e2ac37d63925c56c65':
  Finalize assets for screen cast.
2013-11-13 08:57:58 -08:00
Jeff Brown
81ed043857 Finalize assets for screen cast.
Bug: 11257292
Change-Id: I483496b4fc92bcf8e2c4f080a5a5d5bf97318b5d
2013-11-13 00:43:30 -08:00