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

12403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
f420843a44 am 9605791d: am 7ff9f2b4: am b1ded62f: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev 
* commit '9605791d4165435330979497191a6ac902762271':
  Update power widget icons and fix location behavior Bug: 11242129
 2013-11-14 14:25:09 -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
Lorenzo Colitti
deb8f08ace Dynamically update connectivity and IP address. 
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
 2013-11-15 02:38:36 +09:00
Lorenzo Colitti
6eb6a90821 Cache preferences and services in status dialog. 
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
 2013-11-15 02:38:35 +09:00
Baligh Uddin
1af7627d3c am 94e1d51c: (-s ours) am 2f888a47: (-s ours) am 9b28d5a0: (-s ours) Import translations. DO NOT MERGE 
* commit '94e1d51c697484aca493c362bfef87ac3a24c611':
  Import translations. DO NOT MERGE
 2013-11-13 22:18:02 -08: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
3f4a8e47e1 Merge "Import translations. DO NOT MERGE" 2013-11-14 02:24:51 +00:00
Baligh Uddin
69f6b8a4c6 Import translations. DO NOT MERGE 
Change-Id: Idcb80c7ffa297e2175e8d309aaa9e8845eeb0e12
Auto-generated-cl: translation import
 2013-11-13 18:14:33 -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
57cf0e6671 am bf2f9612: am 3aedfdfd: am 81ed0438: Finalize assets for screen cast. 
* commit 'bf2f96123fde3d1433ac18a072832b5f0f6a604f':
  Finalize assets for screen cast.
 2013-11-13 09:05:55 -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
Wei Wang
5cc44ae3d0 Add ble settings strings. 
Change-Id: If8685aac2f36f56a534f3ba47b1cc60fed88a8a3
 2013-11-12 17:29:32 -08:00
Baligh Uddin
9f4da28899 am 5a04fb76: (-s ours) am 74a503fd: (-s ours) am 622b5d2a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5a04fb76dacbc6b0e030f726f4a03642a108b4dd':
  Import translations. DO NOT MERGE
 2013-11-11 20:51:28 -08:00
Jeff Brown
71504b1f71 am 0df39f39: am 2fba8be9: am 4e54c2a1: Integrate remote display routes into screen cast settings UI. 
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
  Integrate remote display routes into screen cast settings UI.
 2013-11-11 20:51:05 -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
4366e49651 Import translations. DO NOT MERGE 
Change-Id: I4d3ae2840e2024de8eb5a15fbdab5f68123cb1c7
Auto-generated-cl: translation import
 2013-11-11 10:40:56 -08: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
Jeff Brown
4e54c2a177 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
 2013-11-10 21:20:16 -08:00
Ed Heyl
2bfdd36521 am f841589f: am 7ebe4c6c: am a27816dc: merge in release branch changes (no-op). 
* commit 'f841589f6a9b989e18716fac157d16b0d95f70a9':
  Revert "Accessibility: filter touches to Enable button"
 2013-11-08 14:02:40 -08:00