Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,679 Commits 1 Branch 0 Tags
8a313b9dd7e3933dab5d43000b43b73511dcd221
Commit Graph

1825 Commits

Author SHA1 Message Date
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
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
Tadashi G. Takaoka
fe3794a937 Remove "Choose Keyboards" settings 
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
 2014-08-21 11:41:57 +09: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
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
Glenn Kasten
042a9a0bab Increase character limit for translation 
Bug: 17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
 2014-08-15 13:24:45 -07: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
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
PauloftheWest
8fb9053d1c am 675c02ca: am fb070ed7: am cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev 
* commit '675c02ca0deb9991198ee1a10d978298179dce85':
  Added WiFi Assistant settings.
 2014-08-12 20:33:00 +00:00
PauloftheWest
dab86ad25b am c2321bfe: am 40e1d0db: am 0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev 
* commit 'c2321bfe294fe2794b4e8a2c194eaa61d1f516c8':
  Revised Bluetooth discoverability string.
 2014-08-12 18:42:45 +00:00
Etan Cohen
d024f03bf7 am 1cff2416: am 047a6aa5: am 19465fa3: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE" 
* commit '1cff2416a15de353597d81b458c236849df60b04':
  Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
 2014-08-12 00:13:23 +00:00
Etan Cohen
19465fa3eb Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE" 
Superseded by "Enhanced 4G LTE Mode" official setting.

This reverts commit 572d253982.
 2014-08-11 23:55:01 +00:00
PauloftheWest
cccc5defd6 Merge "Added WiFi Assistant settings." into lmp-dev 2014-08-11 17:55:01 +00:00
PauloftheWest
d60f85daad Added WiFi Assistant settings. 
+ Added ability to setup Wifi Assistant.
- Removed 'Avoid poor connections' from WiFi Advance Settings.
- Removed 'Optimize Wi-Fi' from WiFi Advance Settings.
+ Replaced checkboxes with switches in WifFI Advance Settings.
+ Added horizontal rule to seperate MAC/IP address text.

Bug: 15698824
Change-Id: Ia319ff5fb2566854666a07d0e77c8816a49fd3d6
 2014-08-12 11:27:38 -07:00
PauloftheWest
ad11a0f989 Revised Bluetooth discoverability string. 
Bug: 16882911
Change-Id: I89ec10c42747079e9714ae618294d06997059159
 2014-08-12 09:09:05 -07:00
Zoltan Szatmary-Ban
15c212b855 am 986df0c9: am 3acb8874: am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 
* commit '986df0c92ae5900f196a114396802a7d1edaeed7':
  Increase CHAR_LIMIT on Device Admins Settings message
 2014-08-11 12:19:42 +00:00
Alexandra Gherghina
80f5a84bf0 am d857636e: am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'd857636eec3bbb862a9259130fca569c95de3b72':
  Show managed profile under accounts rather than users
 2014-08-11 09:35:53 +00:00
Paul Lawrence
9ab22ac93d am b1f3a008: am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'b1f3a00884dd1e68e460313b1dbb33fbe3c56ba2':
  Strings for next change
 2014-08-08 23:11:24 +00:00
Zoltan Szatmary-Ban
d58f0bd64f Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 2014-08-08 20:34:05 +00:00
Zoltan Szatmary-Ban
a1373770c1 Increase CHAR_LIMIT on Device Admins Settings message 
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.

Bug:16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
 2014-08-11 11:50:39 +01:00
Alexandra Gherghina
ad54ba7030 Merge "Show managed profile under accounts rather than users" into lmp-dev 2014-08-08 20:34:05 +00:00
Alexandra Gherghina
83adb564de Show managed profile under accounts rather than users 
Also fixes overflow menu to update on remove/add managed profile.

Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
 2014-08-11 10:02:13 +01:00
PauloftheWest
f87e196918 am f1103f73: am fc5a4085: am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit 'f1103f73f47be9228b8b61806f945a4d2b953503':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:39:18 +00:00
Paul Lawrence
f8811a59ff Merge "Strings for next change" into lmp-dev 2014-08-07 18:49:59 +00:00
Paul Lawrence
1d14e386af Strings for next change 
Next change is titled
Bring up factory reset UI when decryption fails but password is correct

Strings need to go in today to catch translation for L

Bug: 11477689
Change-Id: I84ddc2f88917ba9749fe4dc58fb00d4020cfe685
 2014-08-08 15:10:18 -07:00
PauloftheWest
ed7b44d83d Fixed Bluetooth renaming bug. 
+ After renaming your Bluetooth device, the title of the Bluetooth
    Activity stays "Bluetooth" instead of changing to the new name.
+ After renaming the device, the status at the bottom Bluetooth Settings
    is correctly displayed.

Bug: 16463239
Change-Id: Ifb12df2004fe1f89bd6f918e23c2c64ae08a0191
 2014-08-08 09:34:15 -07:00