Jim Miller
86e9f7cd66
am 1351b0fb
: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
...
* commit '1351b0fbcddea9cc66941e8af1de148142b92201':
Show trust agent entries as disabled rather than removing them.
2014-08-22 22:34:45 +00:00
Jim Miller
1351b0fbcd
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
2014-08-22 22:25:16 +00:00
Baligh Uddin
3723625fec
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-22 17:24:31 +00:00
Jessica Hummel
1da99d2b45
am 2e9e044e
: Final tweaks to work profile strings
...
* commit '2e9e044ed2c3dbbcd7ce01d2c8b6e00f452cf31b':
Final tweaks to work profile strings
2014-08-22 14:42:05 +00:00
Jessica Hummel
2e9e044ed2
Final tweaks to work profile strings
...
Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:15744182
2014-08-22 14:06:30 +00:00
Alexandra Gherghina
70a7c59daa
am 9239d6d0
: Merge "Update strings for removing work profile" into lmp-dev
...
* commit '9239d6d0a2fd01170b6188a6b92bd716ca962c65':
Update strings for removing work profile
2014-08-22 13:01:59 +00:00
Alexandra Gherghina
dfe2f709c6
am 9c4d5dd8
: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
...
* commit '9c4d5dd86b250dbb0ce9fe5dc9339a7fd7798981':
Modify Spinner so that the arrow is closer to the text
2014-08-22 13:01:58 +00:00
Alexandra Gherghina
9239d6d0a2
Merge "Update strings for removing work profile" into lmp-dev
2014-08-22 12:53:29 +00:00
Alexandra Gherghina
9c4d5dd86b
Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev
2014-08-22 12:53:19 +00:00
Alexandra Gherghina
4c96267acd
Update strings for removing work profile
...
Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
2014-08-22 11:17:31 +01:00
Jim Miller
9d25005e7a
Show trust agent entries as disabled rather than removing them.
...
Fixes bug 17108810
Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
2014-08-21 19:46:26 -07:00
Maurice Lam
103c33145c
am 8be27595
: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
...
* commit '8be27595766a632da8ef78a0a8eaa8dc041232d8':
[WifiSetup] Tablet portrait layout
2014-08-22 01:34:31 +00:00
Maurice Lam
8be2759576
Merge "[WifiSetup] Tablet portrait layout" into lmp-dev
2014-08-22 01:22:25 +00:00
Amith Yamasani
8cf1ec351f
am 2534be37
: Merge "Fix layout of Apn Settings screen" into lmp-dev
...
* commit '2534be37462f9ab5c98ca07758d71f98019eddf4':
Fix layout of Apn Settings screen
2014-08-21 21:03:27 +00:00
Amith Yamasani
2534be3746
Merge "Fix layout of Apn Settings screen" into lmp-dev
2014-08-21 20:51:44 +00:00
Amith Yamasani
ce3cd9df9b
Fix layout of Apn Settings screen
...
Bug: 14081992
Change-Id: I64c458e1585d469434efafd942876f64508723a1
2014-08-21 13:30:35 -07:00
PauloftheWest
2b41c90fed
Removed the Wi-Fi icon shown when Wi-Fi is off.
...
Bug: 16570104
Change-Id: Iacee07c225f6609b92f1df193b682fde0a720a92
2014-08-21 11:57:29 -07:00
Kenny Guy
100d45ec09
am 66b0d9e8
: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev
...
* commit '66b0d9e809a67689daf9b060e5464b4cc196169f':
Disable non-permitted accessibility services and IMEs
2014-08-21 17:57:32 +00:00
Kenny Guy
333f2bc71a
Disable non-permitted accessibility services and IMEs
...
Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
2014-08-21 17:15:49 +01:00
Alexandra Gherghina
75783290b6
Modify Spinner so that the arrow is closer to the text
...
Bug: 17137945
Change-Id: I0769b030669a7a57e0be1c03f987bcd1e0f774ca
2014-08-21 12:44:55 +01:00
Jessica Hummel
a477e8910c
am ff2da2cd
: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
...
* commit 'ff2da2cdb332be35bc94e3e66a10d55fe7bb0105':
Make string for work profile consistent with provisioning and framework strings.
2014-08-21 11:35:04 +00:00
Jessica Hummel
ff2da2cdb3
Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev
2014-08-21 11:28:24 +00:00
Tadashi G. Takaoka
d925c9952d
am fe3794a9
: Remove "Choose Keyboards" settings
...
* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
Remove "Choose Keyboards" settings
2014-08-21 04:15:26 +00:00
Maurice Lam
1677b3e3d4
[WifiSetup] Tablet portrait layout
...
Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26
2014-08-20 20:36:03 -07:00
Tadashi G. Takaoka
fe3794a937
Remove "Choose Keyboards" settings
...
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
2014-08-21 11:41:57 +09:00
Jeff Davidson
a5db8ba5af
am 4e064343
: Merge "Less intrusive VPN dialog." into lmp-dev
...
* commit '4e064343b35cfa6a7615e453c1f6bcf96397e414':
Less intrusive VPN dialog.
2014-08-21 00:09:47 +00:00
Jeff Davidson
4e064343b3
Merge "Less intrusive VPN dialog." into lmp-dev
2014-08-20 21:39:11 +00:00
Amith Yamasani
6879169fe9
am 23d8742d
: Merge "Update string for profile owner addition warning" into lmp-dev
...
* commit '23d8742df6719f3f20545fc345b9f1cc74c6165a':
Update string for profile owner addition warning
2014-08-20 21:08:26 +00:00
John Spurlock
1bc2ff2b30
am dc79528b
: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
...
* commit 'dc79528bf660b9e431141e93a8c1c378af337b7a':
Settings: Remove needless dialogTitle attribute.
2014-08-20 19:53:04 +00:00
Amith Yamasani
23d8742df6
Merge "Update string for profile owner addition warning" into lmp-dev
2014-08-20 18:43:12 +00:00
Amith Yamasani
2e4489d6c3
Update string for profile owner addition warning
...
Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
2014-08-20 13:43:13 -07:00
Jon Miranda
b96f55f060
am 735219be
: Merge "Added a developer option to save attribute data." into lmp-dev
...
* commit '735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
Added a developer option to save attribute data.
2014-08-20 15:30:30 +00:00
Jessica Hummel
fc8cf67df6
Make string for work profile consistent with provisioning and framework strings.
...
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:16468412
2014-08-20 15:45:53 +01:00
Maurice Lam
8904061e66
am e62de59b
: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
...
* commit 'e62de59b947144ded046778b4f4ea0cc4bba12df':
[WifiSetup] Change illustration aspect ratio
2014-08-20 02:22:21 +00:00
Jon Miranda
735219be8f
Merge "Added a developer option to save attribute data." into lmp-dev
2014-08-20 01:43:56 +00:00
Maurice Lam
e62de59b94
Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
2014-08-20 01:43:56 +00:00
Alan Viverette
86cd94a3ad
am aaa066b6
: Add "experimental" subtitle to color correction and inversion
...
* commit 'aaa066b66d4c8acf8931e624cf81376ac35d358e':
Add "experimental" subtitle to color correction and inversion
2014-08-20 00:47:11 +00:00
Alan Viverette
aaa066b66d
Add "experimental" subtitle to color correction and inversion
...
BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
2014-08-19 17:37:16 -07:00
Paul Lawrence
17f213d781
am b7b686ca
: Merge "Fix encryption strings" into lmp-dev
...
* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
Fix encryption strings
2014-08-19 20:59:13 +00:00
Paul Lawrence
71894714c9
am d5a497b8
: Merge "Change decryption strings" into lmp-dev
...
* commit 'd5a497b8375444858fb17008a450d3bc26269d1c':
Change decryption strings
2014-08-19 20:59:12 +00:00
Maurice Lam
c73e339b3b
[WifiSetup] Change illustration aspect ratio
...
Change the aspect ratio of the illustration to 20:9 to align with UX
mocks.
Bug: 17111669
Change-Id: I37b2ca7624b7baf156830db53d2cea97a78e2dab
2014-08-19 13:20:27 -07:00
Amith Yamasani
408943e9aa
am d05dd864
: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
...
* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
Update strings for guest removal affordance and dialog
2014-08-19 15:43:40 +00:00
Baligh Uddin
9ee4596661
Import translations. DO NOT MERGE
...
Change-Id: I01598edaa725d9a59747e892ba470ee1e876f8eb
Auto-generated-cl: translation import
2014-08-18 18:59:06 -07:00
Jon Miranda
0b65294a7a
Added a developer option to save attribute data.
...
After the checkbox for 'Enable view attribute inspection' is checked,
newly constructed Views will save their attribute data.
Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849
2014-08-18 17:16:23 -07: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
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
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
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
Paul Lawrence
d5a497b837
Merge "Change decryption strings" into lmp-dev
2014-08-16 04:03:42 +00:00