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

2210 Commits

Author SHA1 Message Date
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
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
9239d6d0a2 Merge "Update strings for removing work profile" into lmp-dev 2014-08-22 12:53:29 +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
8be2759576 Merge "[WifiSetup] Tablet portrait layout" into lmp-dev 2014-08-22 01:22:25 +00: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
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
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
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
Jeff Davidson
4e064343b3 Merge "Less intrusive VPN dialog." into lmp-dev 2014-08-20 21:39:11 +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
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
Jon Miranda
735219be8f Merge "Added a developer option to save attribute data." 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
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
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
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
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
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
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
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
Maurice Lam
5df0204cf0 am e72e44d0: am 03ec9ff4: am cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev 
* commit 'e72e44d09982ae3c7fcc96ce0cd24e42bbd409d6':
  [WifiSetup] Use framework AutoMirrored
 2014-08-15 21:26:56 +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
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
Maurice Lam
2a118af91b am a604bf23: am 2d57c470: am 3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev 
* commit 'a604bf238597114b28d937f7db4ab34d71c6fd38':
  [WifiSetup] Update illustrations
 2014-08-15 13:37:48 +00:00
PauloftheWest
1cff659ed7 am 8542d9d2: am fd002cf0: am 841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 
* commit '8542d9d27f1e4c51227f71ce1997776f2b4a4114':
  Fixed a bug were secure Wi-Fi connections would show unsecured.
 2014-08-14 23:42:48 +00:00
Glenn Kasten
f3aa4abd4b am 38e472df: am 6a5aad7b: am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit '38e472df158a553f38f7e1e2ba69e61268709226':
  Add setting to disable automatic USB audio routing
 2014-08-14 05:20:51 +00:00
Maurice Lam
d650726b44 [WifiSetup] Update illustrations 
Update illustration assets and support for auto-mirroring for RTL
languages.

Bug: 16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
 2014-08-14 17:48:08 -07:00
Paul Lawrence
ad8bd85d7a Fix encryption strings 
Bug: 16901855
Change-Id: I7297a88c173d5a5ca03ee404938c9d4bad550110
 2014-08-13 16:02:57 -07:00
PauloftheWest
eda2292101 am 22e3dbac: am 4fae753d: am e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev 
* commit '22e3dbac1beb126849b2636741a05c9a7ec2f47a':
  Revert "Add BT message access"
 2014-08-13 14:52:43 +00:00
PauloftheWest
841f760fd7 Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev 2014-08-12 23:14:35 +00:00
PauloftheWest
bc976a017e Fixed a bug were secure Wi-Fi connections would show unsecured. 
- Also removed secure summary code as the UX teams has determined it is
  superfluous.

Bug: 16297100
Change-Id: Ib02bc2c0433f5354a8f8cf01f4d8785762a762ad
 2014-08-13 14:55:00 -07:00
Glenn Kasten
f51dacedd8 Merge "Add setting to disable automatic USB audio routing" into lmp-dev 2014-08-12 23:14:35 +00:00
Glenn Kasten
ca54234efc Add setting to disable automatic USB audio routing 
Bug: 16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
 2014-08-13 11:04:25 -07:00
PauloftheWest
f8cdcbf19c Revert "Add BT message access" 
- removed Message Access screen from Bluetooth overflow

Bug: 15720425
Change-Id: I68191a4639ea7e6b6cd3a60e88160443fab2ba0e
 2014-08-12 14:18:35 -07:00
Maurice Lam
b449417d8a am 40543dcb: am a12d7ba2: am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev 
* commit '40543dcb8bef6b2d44b87e0c78860dfa894a0034':
  [WifiSetup] Fix colors during setup
 2014-08-12 20:33:03 +00:00