PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,484 Commits 1 Branch 0 Tags
fb03058dc9827c9f588cc4f42a74201b8ae06e8c
Commit Graph

12484 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
William Luh
64e676a586 Add event logging for device admin. 
This allows us to gather metrics about unwanted device admin apps. User consent from Verify Apps is required.

Bug: 11253927
Change-Id: I449929772f63f426426f7726d3d21e7c1512e6ce
 2013-11-22 15:45:33 -08:00
The Android Open Source Project
ca99cb71ea Merge commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e' into HEAD 2013-11-22 10:35:36 -08:00
Geoff Mendal
606d3c8b0c am 62d814f9: (-s ours) am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE 
* commit '62d814f9b449b054b33db9587bc9764267571c17':
  Import translations. DO NOT MERGE
 2013-11-21 14:12:21 -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
114cb35aba Import translations. DO NOT MERGE 
Change-Id: Id8eb6d33d1b4d8b5bb3149a0a47295a43cf73e38
Auto-generated-cl: translation import
 2013-11-21 12:45:53 -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
c384651a2b am e178a756: (-s ours) am cd0726f7: (-s ours) am f06ce4eb: (-s ours) Import translations. DO NOT MERGE 
* commit 'e178a756df4af2ac14b2123dbf76c8f788addbc7':
  Import translations. DO NOT MERGE
 2013-11-20 13:24:13 -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
0c54a094c7 Import translations. DO NOT MERGE 
Change-Id: I94cb4e4f70c7c1766fde7e6526d3d81fb48cbee6
Auto-generated-cl: translation import
 2013-11-20 11:33:22 -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
8dd9b71f7c am 169e8a0c: am 017d2a18: am 130118d4: Add help url for remote display. 
* commit '169e8a0c2aee26731a847a46954d95a78161ecd8':
  Add help url for remote display.
 2013-11-18 19:13:24 -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
f63b4c5810 am f9ca318a: (-s ours) am 6d34b698: (-s ours) am 91c54aa8: (-s ours) Import translations. DO NOT MERGE 
* commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b':
  Import translations. DO NOT MERGE
 2013-11-18 11:21:32 -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
49c1180bca Import translations. DO NOT MERGE 
Change-Id: I663345c8d08908d48cf214aeeda4ab9bbe71d58d
Auto-generated-cl: translation import
 2013-11-18 11:09:45 -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
9bac99e9c4 am 5569a8f4: am 9c8a463c: am beb9a03b: Merge "Remove hardcoded msgid. We have already leveraged in TC." into klp-dev 
* commit '5569a8f48c742aa2aded408d0b3e8de7a0cba172':
  Remove hardcoded msgid.  We have already leveraged in TC.
 2013-11-15 12:03:39 -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
b18b93378a am 5d3dd3a1: (-s ours) am 72d674af: (-s ours) am ebf21489: (-s ours) Import translations. DO NOT MERGE 
* commit '5d3dd3a15a5399a0ce178022c45eaca848e34c7d':
  Import translations. DO NOT MERGE
 2013-11-15 11:50:14 -08: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
325bcaa468 Merge "Import translations. DO NOT MERGE" 2013-11-15 19:27:37 +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
2694047294 am 8f9d4e32: (-s ours) am 67a0472f: (-s ours) am 503b6def: (-s ours) Import translations. DO NOT MERGE 
* commit '8f9d4e323118fefcf418b6019eaeaf880b1d6d12':
  Import translations. DO NOT MERGE
 2013-11-15 11:19:15 -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
5d671a70ad Import translations. DO NOT MERGE 
Change-Id: I7f948fb8948f8b0782a4a75dea963d6ba1481bd5
Auto-generated-cl: translation import
 2013-11-15 11:08:07 -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
7662c1f21f am 03360cd2: am 196bc5c6: am e7b781f5: Merge "Show correct message for a print job that is being canceled." into klp-dev 
* commit '03360cd23910c73c78a822c559acb3eb66a8e07b':
  Show correct message for a print job that is being canceled.
 2013-11-14 22:34:13 -08: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
Lorenzo Colitti
35684faff1 Merge "Dynamically update connectivity and IP address." 2013-11-15 05:09:48 +00:00
Lorenzo Colitti
04234ecfba Merge "Cache preferences and services in status dialog." 2013-11-15 05:07:00 +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
e58dda114c am be6858e8: am 8174aad5: am 36f98428: Merge "Update cast screen strings." into klp-dev 
* commit 'be6858e86f2bf89832e63a7a51663ac6cd13aab0':
  Update cast screen strings.
 2013-11-14 17:37:31 -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
a7e2abb530 am f75a736a: am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper 
* commit 'f75a736a3e19385d7635a1c8b5f25f70d3b08dbc':
  Don't show keyguard on top of CryptKeeper
 2013-11-14 16:33:12 -08: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