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
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
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
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
Paul Lawrence
c8452ae031
Change decryption strings
...
Bug: 17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
2014-08-19 08:56:49 -07: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
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
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
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
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
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
Maurice Lam
03ec9ff439
am cd93d141
: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
...
* commit 'cd93d141302ee374285d5a8dcd97bc7ab61298cc':
[WifiSetup] Use framework AutoMirrored
2014-08-15 20:36:35 +00:00
Fabrice Di Meglio
e3bced2cda
Update Airplane mode to use a SwitchPreference
...
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
2014-08-15 20:36:29 +00:00
Glenn Kasten
2be2a8a47f
Merge "Increase character limit for translation" into lmp-dev
2014-08-15 18:56:10 +00:00
Glenn Kasten
042a9a0bab
Increase character limit for translation
...
Bug: 17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
2014-08-15 13:24:45 -07:00
Maurice Lam
cd93d14130
Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
2014-08-15 18:50:14 +00:00
Maurice Lam
8d449a0e36
[WifiSetup] Use framework AutoMirrored
...
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.
Bug: 17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
2014-08-15 12:54:33 -07:00
Fabrice Di Meglio
1b1f3d5949
am 0ff107e3
: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev
...
* commit '0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
Fix bug #16703191 APN settings shows back button even when you intent into it
2014-08-15 18:46:56 +00:00
Baligh Uddin
86370f5dfd
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-15 04:38:54 +00:00
Fabrice Di Meglio
0ff107e384
Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev
2014-08-15 04:37:53 +00:00
Fabrice Di Meglio
61a1fec49f
Fix bug #16703191 APN settings shows back button even when you intent into it
...
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment
Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
2014-08-15 11:36:31 -07:00
Maurice Lam
2d57c4705d
am 3d8dd19c
: Merge "[WifiSetup] Update illustrations" into lmp-dev
...
* commit '3d8dd19c85ca94e647245a70df9ca6a9c039b7de':
[WifiSetup] Update illustrations
2014-08-15 02:55:34 +00:00
arete
943a1877e6
am ce543836
: Change checkboxes to switches in "Settings->Backup&Reset"
...
* commit 'ce543836cea5887484026837f0a4181dca04a733':
Change checkboxes to switches in "Settings->Backup&Reset"
2014-08-14 20:24:39 +00:00
arete
ce543836ce
Change checkboxes to switches in "Settings->Backup&Reset"
...
Change-Id: I92b5d0051b717c66bc456a0864c3068b13112dd3
Bug: 16982604
2014-08-14 19:57:50 +00:00