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

11615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
c3835eae23 am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':
 2013-12-05 19:21:35 +00:00
Baligh Uddin
bf3d3f8fd0 am c7891c6c: (-s ours) am ff2aed99: (-s ours) am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE 
* commit 'c7891c6c8d309710a4b948ad2084e43bcd7ebe5c':
 2013-12-05 19:21:34 +00:00
Amith Yamasani
436e4fd49f am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev 
* commit '05e2459fb85848b19362554a7ffeb2e9b50da720':
 2013-12-05 19:21:33 +00:00
David Christie
7fcc1d733f am aba6eb64: am b8fa4d9f: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev 
* commit 'aba6eb64633e7957afe036a5d7c506b9c059ec3e':
 2013-12-05 19:21:32 +00:00
Svetoslav
0e001877d3 am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings. 
* commit '0427cb67d1545d38859e6522905b4a78d82bacc7':
 2013-12-05 19:21:31 +00:00
Lifu Tang
fb2b5cd951 am 098061c2: am 88afb32f: Displays a list of most recent location apps 
* commit '098061c2022164e169ec40e6114b48dd5bfcaff2':
 2013-12-05 19:21:30 +00:00
Lifu Tang
cd4126005d am 7b449db2: am b14698ee: Merge "Finished the location settings" 
* commit '7b449db21ecae05f95355544936bd840a89601c7':
 2013-12-05 19:21:28 +00:00
Jason Monk
92d5dd36f4 am 49d6f604: am 71decb7b: Merge "Restriction pin changes." 
* commit '49d6f604f1ce05d90c8bdf25330fe8eb3eb924c9':
 2013-12-05 19:21:27 +00:00
Baligh Uddin
e9529fe6cd am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':
 2013-12-05 19:21:26 +00: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
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
f06ce4eb96 Import translations. DO NOT MERGE 
Change-Id: I5ef68d36b77bb0374026bdf5e1d2a909156be3d7
Auto-generated-cl: translation import
 2013-11-20 11:27:32 -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
91c54aa818 Import translations. DO NOT MERGE 
Change-Id: I2c40d9f0cd08ff5d746f6ab3d608a12ed239ed3b
Auto-generated-cl: translation import
 2013-11-18 11:02:58 -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
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
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
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
36f98428d4 Merge "Update cast screen strings." into klp-dev 2013-11-15 01:29:05 +00: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
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
9b28d5a0c3 Import translations. DO NOT MERGE 
Change-Id: Ib1ee67aee616ec7f9c66191102dc2fbee9ef39de
Auto-generated-cl: translation import
 2013-11-13 18:06:51 -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
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
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
a27816dc2d merge in release branch changes (no-op). 2013-11-08 13:23:52 -08:00
David Christie
587e6bf3fc Update power widget icons and fix location behavior 
Bug: 11242129

Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
 2013-11-07 11:20:35 -08:00
Robert Greenwalt
29b7a8446a Merge "Add batch scan data to power stats." into klp-dev 2013-11-07 18:31:03 +00:00
The Android Automerger
84760b633b merge in klp-mr1-release history after reset to klp-dev 2013-11-07 06:01:28 -08:00
Baligh Uddin
7d7164361e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-07 04:00:05 +00:00
Kenny Root
8be30bb162 Revert "Accessibility: filter touches to Enable button" 
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
 2013-11-06 15:14:16 -08:00
Kenny Root
d0de39e716 Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev 2013-11-06 23:09:06 +00:00
Baligh Uddin
4a5e53aa02 Import translations. DO NOT MERGE 
Change-Id: I81129ec9d537a26df337e5f306b8897ce9fdc810
Auto-generated-cl: translation import
 2013-11-06 14:34:35 -08:00
Kenny Root
b974fa8034 Revert "Accessibility: filter touches to Enable button" 
This reverts commit 94d4f23dcc.

Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
 2013-11-06 22:03:52 +00:00
Lifu Tang
741bc05424 Merge "Shows LGAAYL when launching Location Settings" into klp-dev 2013-11-06 06:20:56 +00:00
Geoffrey Borggaard
5b7111d05d Merge "Remove line break." into klp-dev 2013-11-06 02:37:48 +00:00
Jason Monk
4e42c80872 Merge "Add PAC UI to Wi-Fi Settings" into klp-dev 2013-11-06 02:20:50 +00:00
Baligh Uddin
1bfd35410d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-05 23:12:13 +00:00
Amith Yamasani
060d5fd172 Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev 2013-11-05 21:51:43 +00:00
Jason Monk
070f3560d5 Add PAC UI to Wi-Fi Settings 
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None.  This should only be visible in EDU users as only EDU
has PAC.

Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
 2013-11-05 14:39:44 -05:00
Geoffrey Borggaard
03c56a95d3 Remove line break. 
The "network may be monitored" message had an extra line break.
Bug: 11534572

Change-Id: I7a0e9845413f2e5787ca60ad9e2f8988eed207a6
 2013-11-05 13:10:49 -05:00
Kenny Root
8cc60da4c9 Merge "Accessibility: filter touches to Enable button" into klp-dev 2013-11-05 00:12:19 +00:00
Baligh Uddin
734def9d81 Import translations. DO NOT MERGE 
Change-Id: Ibae16129afb209250dddbfa8415fc2c780703a94
Auto-generated-cl: translation import
 2013-11-04 15:23:56 -08:00
Lifu Tang
fe9420f7da Shows LGAAYL when launching Location Settings 
- Partial fix of b/10897468

Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616
 2013-11-04 11:37:55 -08:00
Amith Yamasani
49f9a444f3 Adjust power control widget minWidth to occupy 4 cells. 
Bug: 10561000
Change-Id: I9a4312d956581059ea43077c5228e43e2bd1c7a5
 2013-11-01 17:17:08 -07:00
Baligh Uddin
e2b0278fa3 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-01 14:46:21 +00:00