PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,964 Commits 1 Branch 0 Tags
6a1d96e710f155b148c60cecce5c6beae1d02db1
Commit Graph

11964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
6a1d96e710 am ca99cb71: Merge commit \'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e\' into HEAD 
* commit 'ca99cb71eab502037120cdf68f854c882fcd9e57':
 2013-11-22 19:18:34 -08:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Geoff Mendal
62d814f9b4 am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE 
* commit '548614a4e6e0571d5cf06eb5514d0db8fc017d0b':
  Import translations. DO NOT MERGE
 2013-11-21 14:10:26 -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
e178a756df am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE 
* commit 'cd0726f7d824759984a7024826fbfbcaba575400':
  Import translations. DO NOT MERGE
 2013-11-20 13:19:50 -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
169e8a0c2a am 017d2a18: am 130118d4: Add help url for remote display. 
* commit '017d2a189ac758ad035182a886c4f4e578cee6f2':
  Add help url for remote display.
 2013-11-18 19:09:55 -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
f9ca318a3d am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE 
* commit '6d34b6988b257eb35cd7162d403f6da8114e0b9b':
  Import translations. DO NOT MERGE
 2013-11-18 11:18:59 -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
5569a8f48c am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev 
* commit '9c8a463c3005d8b3d96bde28ecc00a5b2788d9e3':
  Remove hardcoded msgid.  We have already leveraged in TC.
 2013-11-15 11:59:35 -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
5d3dd3a15a am 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE 
* commit '72d674af97df6f964f217ad7eddec7ea58612114':
  Import translations. DO NOT MERGE
 2013-11-15 11:46:33 -08: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
8f9d4e3231 am 67a0472f: (-s ours) am 503b6def: (-s ours) Import translations. DO NOT MERGE 
* commit '67a0472f3f53c924d180fdabe41bb26608219a83':
  Import translations. DO NOT MERGE
 2013-11-15 11:15:23 -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
03360cd239 am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev 
* commit '196bc5c63a3f08bc8dc972ee82f7fe98a453b8f5':
  Show correct message for a print job that is being canceled.
 2013-11-14 22:30:53 -08: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
be6858e86f am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev 
* commit '8174aad50382280c55a33f2572eb1fcdb53078c1':
  Update cast screen strings.
 2013-11-14 17:35:01 -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
f75a736a3e am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper 
* commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad':
  Don't show keyguard on top of CryptKeeper
 2013-11-14 16:29:39 -08: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
9605791d41 am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev 
* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
  Update power widget icons and fix location behavior Bug: 11242129
 2013-11-14 14:20:31 -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
94e1d51c69 am 2f888a47: (-s ours) am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE 
* commit '2f888a47522f8dcaad3f7ec32274675dd74c1501':
  Import translations. DO NOT MERGE
 2013-11-13 18:37:13 -08: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
bf2f96123f am 3aedfdfd: am 81ed0438: Finalize assets for screen cast. 
* commit '3aedfdfdbfcff15f6b761fca3b6bda8449f11053':
  Finalize assets for screen cast.
 2013-11-13 09:02:20 -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
Baligh Uddin
5a04fb76da am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '74a503fddf2626f6aedec486e9b30c4beb6377e2':
  Import translations. DO NOT MERGE
 2013-11-11 14:48:31 -08:00
Baligh Uddin
74a503fddf am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '622b5d2a6af0cda319e4fbe066d62e36b06f7aa3':
  Import translations. DO NOT MERGE
 2013-11-11 14:44:42 -08:00
Baligh Uddin
622b5d2a6a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:41:12 +00:00
Baligh Uddin
b50dc884a2 Import translations. DO NOT MERGE 
Change-Id: Icd51d4bde4dadc325ff26b08dece13e761a99430
Auto-generated-cl: translation import
 2013-11-11 10:35:06 -08:00
Jeff Brown
0df39f39fc am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 10:27:24 -08:00
Jeff Brown
2fba8be9c0 am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '4e54c2a17765aed01ba23c9b0ec4d41e66c698b7':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 10:21:59 -08:00