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
Baligh Uddin
b3b647054e
Import translations. DO NOT MERGE
...
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
2014-08-15 14:21:56 -07:00
Glenn Kasten
d0ec634c74
am e89abcc8: am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
...
* commit 'e89abcc8e88bec69e37f11fa051b9b299246a0f3':
Increase character limit for translation
2014-08-15 21:17:31 +00:00
arete
e20063fc33
am 4595b470: am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit '4595b470d37a3152d6f76488414e58da3ad516a4':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 21:17:29 +00:00
Fabrice Di Meglio
c33bac8254
am 880de9f2: am e3bced2c: Update Airplane mode to use a SwitchPreference
...
* commit '880de9f2edd81e1ad09158f07893374053210778':
Update Airplane mode to use a SwitchPreference
2014-08-15 21:17:08 +00:00
Maurice Lam
e72e44d099
am 03ec9ff4: am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
...
* commit '03ec9ff4395ea2275e54e40f6ecdaa2721cf26e9':
[WifiSetup] Use framework AutoMirrored
2014-08-15 21:17:07 +00:00
Julia Reynolds
9d20b0c089
am eb0d3b7c: am fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev
...
* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
Disable disable button according to user restrictions.
2014-08-15 21:16:59 +00:00
Glenn Kasten
e89abcc8e8
am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
...
* commit '2be2a8a47f5ef585301479268752aa3d7d3a9261':
Increase character limit for translation
2014-08-15 21:07:10 +00:00
Fabrice Di Meglio
1c6d540646
am 1b1f3d59: am 0ff107e3: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev
...
* commit '1b1f3d5949a68967e5cc405d5aed1c357ecb0aa0':
Fix bug #16703191 APN settings shows back button even when you intent into it
2014-08-15 20:59:21 +00:00
arete
4595b470d3
am 300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit '300e920f66c03b390ce738ccf4d4646ffa039d40':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 20:56:44 +00:00
arete
300e920f66
Keep SwitchPreference status until user makes choice in confirmation dialog.
...
Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
2014-08-15 20:49:44 +00:00
Fabrice Di Meglio
880de9f2ed
am e3bced2c: Update Airplane mode to use a SwitchPreference
...
* commit 'e3bced2cdaf70812f658c45c170e4943ed79dfaf':
Update Airplane mode to use a SwitchPreference
2014-08-15 20:45:12 +00:00