Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,725 Commits 1 Branch 0 Tags
17adb55689cf3ff507435d950b61ba0148b38e34
Commit Graph

5149 Commits

Author SHA1 Message Date
Baligh Uddin
3f2be99c1d Merge "Import translations. DO NOT MERGE" 2014-08-22 17:24:32 +00:00
Jessica Hummel
da277ed6e3 am 6c86560c: am 1da99d2b: am 2e9e044e: Final tweaks to work profile strings 
* commit '6c86560cad3fc0ab1d198ba3a429f9cb79b15f99':
  Final tweaks to work profile strings
 2014-08-22 15:01:59 +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
4810f9b49d am 61d33eb7: am 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev 
* commit '61d33eb7b7c4a38e4d53e2de5425f1594715f3fd':
  Update strings for removing work profile
 2014-08-22 13:21:01 +00:00
Alexandra Gherghina
0e895c675e am 6db44b35: am dfe2f709: am 9c4d5dd8: Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev 
* commit '6db44b35db9636c752004597d2148f36984966bf':
  Modify Spinner so that the arrow is closer to the text
 2014-08-22 13:21:00 +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
Maurice Lam
c1d149fd35 am 6d1a798c: am 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev 
* commit '6d1a798ce5e24fa1de63690f93c1d0fe35b2e852':
  [WifiSetup] Tablet portrait layout
 2014-08-22 03:14:02 +00: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
93ed43524d am 727b53ad: am 8cf1ec35: am 2534be37: Merge "Fix layout of Apn Settings screen" into lmp-dev 
* commit '727b53adecc436a91cb7333a59152305b93f94cd':
  Fix layout of Apn Settings screen
 2014-08-21 21:23:52 +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
Kenny Guy
2c7addd8ab am 38afb092: am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev 
* commit '38afb092aecc5585d75ef3d5e54129d3600d1ae6':
  Disable non-permitted accessibility services and IMEs
 2014-08-21 18:15:56 +00: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
Jessica Hummel
9dff428485 am 1cba7345: am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev 
* commit '1cba7345801050c90652beed852d7209b7a948b9':
  Make string for work profile consistent with provisioning and framework strings.
 2014-08-21 13:39:29 +00: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
d9035ef969 am 389bea96: am d925c995: am fe3794a9: Remove "Choose Keyboards" settings 
* commit '389bea96d92ee162d5bb286884f9e536baca05c2':
  Remove "Choose Keyboards" settings
 2014-08-21 05:16:19 +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
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