PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,968 Commits 1 Branch 0 Tags
5ae5557e51b2bf98e6f9264d2418a0d6fa3cb221
Commit Graph

15968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PauloftheWest
6e73e81ab7 am a4ab5a3a: am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev 
* commit 'a4ab5a3a2b0924d55445a1c195336bd9e237d577':
  Fixed a crash when rotating a saved networks dialog.
 2014-08-18 20:15:04 +00:00
PauloftheWest
fe9c0e056c am 480fcb24: am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev 
* commit '480fcb2432c6a1d0615eacdf50b144ce5e435dae':
  Fixed a bug were AdvanceWifiSettings would crash on resume.
 2014-08-18 20:15:03 +00:00
PauloftheWest
a4ab5a3a2b am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev 
* commit '31584ec3e99ded3dd96de06bcb1aa8e4dc408cce':
  Fixed a crash when rotating a saved networks dialog.
 2014-08-18 20:07:36 +00:00
PauloftheWest
480fcb2432 am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev 
* commit '6a2b1a44d2ed5bc0b5025ec62a51662850499d71':
  Fixed a bug were AdvanceWifiSettings would crash on resume.
 2014-08-18 20:07:35 +00:00
Lifu Tang
db0b7637fa Dim the preference icons when its disabled 
- Fix b/16956979

Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
 2014-08-18 11:22:13 -07:00
Alexandra Gherghina
518f3e0075 am 9db8f0aa: am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev 
* commit '9db8f0aaf3f220208e50b088e4114ee41b0ff19c':
  Switch to listening for USER_INITIALIZE broadcast in the Settings app.
 2014-08-18 17:07:05 +00:00
Alexandra Gherghina
9db8f0aaf3 am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev 
* commit '0cad779d3e4d7ef361fa972e54879cd6791b467c':
  Switch to listening for USER_INITIALIZE broadcast in the Settings app.
 2014-08-18 16:56:17 +00:00
Alexandra Gherghina
13e00185b8 am 4b81ebf2: am cd88c2f7: Fix Account Settings crash 
* commit '4b81ebf28557b8ed61ecdce96fcdef30c851ca4d':
  Fix Account Settings crash
 2014-08-18 16:44:28 +00:00
Alexandra Gherghina
4b81ebf285 am cd88c2f7: Fix Account Settings crash 
* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
  Fix Account Settings crash
 2014-08-18 16:39:54 +00:00
Alexandra Gherghina
cd88c2f7c3 Fix Account Settings crash 
Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
 2014-08-18 14:34:13 +01:00
Zoltan Szatmary-Ban
131b497f58 Put VPN settings under primary profile control 
Bug:16030111
Change-Id: If9815b8c9486e47bb860ff941ef5469ec6145ad6
 2014-08-18 13:48:15 +01:00
Zoltan Szatmary-Ban
1613cb0da4 Update Trusted Credentials screen in settings 
Trusted credentials for both the primary user and its managed profiles are shown
on the Trusted Credentials fragment. All functionalities (e.g. disabling/enabling
of certificates) remain available.

Bug: 16029580
Change-Id: Id6335d12ec5fbeed0e254f3ded1e715def3e8e04
 2014-08-18 12:29:55 +01:00
Baligh Uddin
1169cd85d2 am 1f4e0347: (-s ours) am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1f4e0347b903823a19417e57d0e398e6e9c5dda6':
  Import translations. DO NOT MERGE
 2014-08-17 14:24:12 +00:00
Baligh Uddin
1f4e0347b9 am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f14fa7ed4e9c61543a10f081027489558c4bc104':
  Import translations. DO NOT MERGE
 2014-08-17 14:08:30 +00:00
Adam Lesinski
6f0b3aa9d9 am 82951de9: am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev 
* commit '82951de9fe1be4686e80ea61807140274deaff50':
  Added Warning dialog when enabling usage access for app
 2014-08-16 06:56:29 +00:00
Adam Lesinski
82951de9fe am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev 
* commit 'a9dc57c145c91eaa5b43510575eae3e425adc461':
  Added Warning dialog when enabling usage access for app
 2014-08-16 06:49:40 +00:00
Baligh Uddin
464114588d am a07fddf1: (-s ours) am 88ee936a: (-s ours) am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE 
* commit 'a07fddf1834f80872a83527dc5309d96fadb151d':
  Import translations. DO NOT MERGE
 2014-08-16 04:51:34 +00:00
Baligh Uddin
a07fddf183 am 88ee936a: (-s ours) am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE 
* commit '88ee936a94db3dcbecf7089183f740ab184c3907':
  Import translations. DO NOT MERGE
 2014-08-16 04:38:20 +00:00
John Spurlock
dc79528bf6 Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev 2014-08-16 04:32:18 +00:00
John Spurlock
8b3766de66 Settings: Remove needless dialogTitle attribute. 
DropDownPreference has no dialog, and therefore no title.

Remove to avoid confusion for future copy-pasters.

Bug:16241745
Change-Id: I1130ed5d90b9b769294b64f02ddbf8f00fabe6b0
 2014-08-20 15:37:07 -04:00
Amith Yamasani
d05dd864d6 Merge "Update strings for guest removal affordance and dialog" into lmp-dev 2014-08-16 04:32:18 +00:00
Amith Yamasani
94c0181c8f Update strings for guest removal affordance and dialog 
Exit guest -> Remove guest
etc.

Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
 2014-08-18 16:42:43 -07:00
PauloftheWest
31584ec3e9 Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev 2014-08-16 04:32:18 +00:00
PauloftheWest
3280dc144f Fixed a crash when rotating a saved networks dialog. 
Bug: 16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
 2014-08-18 09:28:21 -07:00
Alexandra Gherghina
0cad779d3e Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev 2014-08-16 04:29:45 +00:00
Alexandra Gherghina
f2e39f2ee4 Switch to listening for USER_INITIALIZE broadcast in the Settings app. 
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.

Bug: 17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
 2014-08-18 17:42:26 +01:00
Paul Lawrence
d5a497b837 Merge "Change decryption strings" into lmp-dev 2014-08-16 04:03:42 +00:00
Paul Lawrence
c8452ae031 Change decryption strings 
Bug: 17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
 2014-08-19 08:56:49 -07:00
PauloftheWest
6a2b1a44d2 Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev 2014-08-16 04:03:42 +00:00
PauloftheWest
c2cf256853 Fixed a bug were AdvanceWifiSettings would crash on resume. 
Bug: 17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
 2014-08-18 11:49:09 -07:00
Baligh Uddin
88ee936a94 am 2719eebf: (-s ours) am b3b64705: (-s ours) Import translations. DO NOT MERGE 
* commit '2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
  Import translations. DO NOT MERGE
 2014-08-16 04:02:06 +00:00
Baligh Uddin
f14fa7ed4e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-16 03:56:00 +00:00
Baligh Uddin
e63747ac7b Import translations. DO NOT MERGE 
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
 2014-08-16 00:01:16 -07:00
Adam Lesinski
a9dc57c145 Merge "Added Warning dialog when enabling usage access for app" into lmp-dev 2014-08-16 03:52:42 +00:00
Adam Lesinski
e01dfd1a82 Added Warning dialog when enabling usage access for app 
The user is now thoroughly warned about enabling third party
app access to device history.

Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
 2014-08-15 21:14:28 -07:00
Paul Lawrence
b7b686cadf Merge "Fix encryption strings" into lmp-dev 2014-08-16 03:51:48 +00:00
Julia Reynolds
7138ed7404 Merge "Supress menu if screen ought to be hidden." into lmp-dev 2014-08-16 03:51:48 +00:00
Julia Reynolds
6cc7cccf11 Supress menu if screen ought to be hidden. 
Bug: 14081992
Change-Id: I56183413a001b3e6dd74de249e9afc131e6671e4
 2014-08-18 16:04:48 -04:00
Christopher Tate
17488da041 am 98774d34: am 568eeca5: Disallow downgrade of bundled home apps 
* commit '98774d3445e988840d4f68a91fbe7b9f48c3364c':
  Disallow downgrade of bundled home apps
 2014-08-16 00:49:10 +00:00
Christopher Tate
98774d3445 am 568eeca5: Disallow downgrade of bundled home apps 
* commit '568eeca569f97bfdd7cf6ae3b9cb5e7360eadc2c':
  Disallow downgrade of bundled home apps
 2014-08-16 00:43:04 +00:00
Christopher Tate
568eeca569 Disallow downgrade of bundled home apps 
Bug 14162565

Change-Id: I754721178722edbf0765039bc9669ed24b92633c
 2014-08-15 15:36:56 -07:00
Baligh Uddin
2719eebfc5 am b3b64705: (-s ours) Import translations. DO NOT MERGE 
* commit 'b3b647054e8610a29536ccee7be3aa2483e16431':
  Import translations. DO NOT MERGE
 2014-08-15 22:36:02 +00:00
Jim Miller
248e9eff3d am 0b4e4fb1: am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev 
* commit '0b4e4fb1102eb2ec421faa81afcb889eacb7f772':
  Remove temporary workaround for GMS TrustAgent while API changed.
 2014-08-15 22:04:00 +00:00
Jeff Davidson
90b3b211ef Less intrusive VPN dialog. 
Add new AppOps to Settings and remove references to obsolete
ManageDialog. VPN UX now lives in Quick Settings.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
 2014-08-15 15:00:50 -07:00
Jim Miller
0b4e4fb110 am 23c76e38: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev 
* commit '23c76e38ef2a62a996dbb304c558c80b3fee5f28':
  Remove temporary workaround for GMS TrustAgent while API changed.
 2014-08-15 21:45:31 +00:00
Fabrice Di Meglio
6dded22257 am e15902d6: am 4325f808: Update NFC to use a SwitchPreference 
* commit 'e15902d61727e7924563ef76113fa49a65358ca8':
  Update NFC to use a SwitchPreference
 2014-08-15 21:42:46 +00:00
Fabrice Di Meglio
e15902d617 am 4325f808: Update NFC to use a SwitchPreference 
* commit '4325f8080888bd3b15246f5bbd9db878aced030c':
  Update NFC to use a SwitchPreference
 2014-08-15 21:37:24 +00:00
Fabrice Di Meglio
4325f80808 Update NFC to use a SwitchPreference 
- do the switch

See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
 2014-08-15 14:28:04 -07:00
Jim Miller
23c76e38ef Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev 2014-08-15 21:23:40 +00:00
Jim Miller
6a0c89743c Remove temporary workaround for GMS TrustAgent while API changed. 
Fixes bug 16401527

Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
 2014-08-15 14:30:01 -07:00