Commit Graph

5375 Commits

Author SHA1 Message Date
Tadashi G. Takaoka
d925c9952d am fe3794a9: Remove "Choose Keyboards" settings
* commit 'fe3794a9372d643afe8cd6d8e70ec4f9e1b47a48':
  Remove "Choose Keyboards" settings
2014-08-21 04:15:26 +00:00
Jeff Davidson
d4f0bea64f am deb9cf1a: am a5db8ba5: am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev
* commit 'deb9cf1abb547506b7eeeb81021b6e35cc7d0667':
  Less intrusive VPN dialog.
2014-08-21 04:10:40 +00:00
Amith Yamasani
56635ebd5f am 05ff676f: am 6879169f: am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev
* commit '05ff676f5cf426bd054e624354b7e91418a7a5ef':
  Update string for profile owner addition warning
2014-08-21 04:10:37 +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
John Spurlock
efffa590df am 1189e70b: am 1bc2ff2b: am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev
* commit '1189e70be4e052576cd721ecbb4801b53b457fa2':
  Settings: Remove needless dialogTitle attribute.
2014-08-21 00:56:58 +00: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
c895872545 am af1d4c7c: am b96f55f0: am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev
* commit 'af1d4c7c1557a997ba8f1439972665c63cf0e8dc':
  Added a developer option to save attribute data.
2014-08-20 15:48:34 +00: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
ad0c5416b0 am 5cb59e2d: am 8904061e: am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev
* commit '5cb59e2df6812f470ac4761e5163a8a63cbd4eee':
  [WifiSetup] Change illustration aspect ratio
2014-08-20 03:07:27 +00: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
15b9ce3ba9 am 5dc1fed4: am 86cd94a3: am aaa066b6: Add "experimental" subtitle to color correction and inversion
* commit '5dc1fed4dad928f2daf33a062d1968077f695217':
  Add "experimental" subtitle to color correction and inversion
2014-08-20 01:12:10 +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
197344cdb6 am 9e3117de: am 17f213d7: am b7b686ca: Merge "Fix encryption strings" into lmp-dev
* commit '9e3117de835f092de06473d9793c9be0eae34f35':
  Fix encryption strings
2014-08-19 21:15:24 +00:00
Paul Lawrence
eb20ea108e am 5b22e3d0: am 71894714: am d5a497b8: Merge "Change decryption strings" into lmp-dev
* commit '5b22e3d03b0a06f49668b03140f95d2b5f2590c7':
  Change decryption strings
2014-08-19 21:15:23 +00: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
a44e57802e am 6b3973fc: am 408943e9: am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev
* commit '6b3973fc1e436f0e1adce6f4b331865a386b85a3':
  Update strings for guest removal affordance and dialog
2014-08-19 15:59:08 +00: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
0a07ee810c Import translations. DO NOT MERGE
Change-Id: I369c46e528751386b3c713143036b233d715dc29
Auto-generated-cl: translation import
2014-08-18 19:09:47 -07: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
346249eb6d am 6f0b3aa9: am 82951de9: am a9dc57c1: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
* commit '6f0b3aa9d9f9be9ca37626314f83c886f6e8a9bc':
  Added Warning dialog when enabling usage access for app
2014-08-16 07:03:43 +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
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
Fabrice Di Meglio
36585bef4f am 6dded222: am e15902d6: am 4325f808: Update NFC to use a SwitchPreference
* commit '6dded22257031f6a95e103a69ea2d182c315327a':
  Update NFC to use a SwitchPreference
2014-08-16 00:43:44 +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
bf84be427d am d0ec634c: am e89abcc8: am 2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
* commit 'd0ec634c74fad66e6d8d5add4d5124167320a367':
  Increase character limit for translation
2014-08-15 21:26:59 +00:00
Fabrice Di Meglio
60e678e5d2 am c33bac82: am 880de9f2: am e3bced2c: Update Airplane mode to use a SwitchPreference
* commit 'c33bac825497da0746f3098fb8c02d4e9f439c3a':
  Update Airplane mode to use a SwitchPreference
2014-08-15 21:26:57 +00:00