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

1793 Commits

Author SHA1 Message Date
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
Sander Alewijnse
18c1fcf73a am 400658ad: am 6173fed5: am 6a39bc68: Merge "Prevent launcher switching in Settings app." into lmp-dev 
* commit '400658ad32a7c11b172557ebfab67cf423a20db7':
  Prevent launcher switching in Settings app.
 2014-08-07 12:05:38 +00:00
Dan Sandler
06fd8fd70d am 43b0f512: am 0ed91709: am 4bdf8b49: Merge "Replace missing resource." into lmp-dev 
* commit '43b0f512d10a4ca1c1e33744cfdc796b3d1aea9c':
  Replace missing resource.
 2014-08-06 18:08:44 +00:00
Fabrice Di Meglio
64579fcb17 am 0ecc58ff: am 911a54df: am bce84e79: Merge "Fix bug #16712121 Add \'Experimental\' substring to \'High contrast text\'" into lmp-dev 
* commit '0ecc58ff9bbc1d718156d094845d8363c28aec5a':
  Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'
 2014-08-06 18:08:44 +00:00
Dianne Hackborn
02ff050ed9 am 82a1b548: am b8e0e338: am dc77335e: Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 
* commit '82a1b548057363600eb6166febbb3baae5365836':
  Fix issue #16537318: clarify voice interaction strings.
 2014-08-06 17:36:02 +00:00
Fabrice Di Meglio
bce84e798b Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'" into lmp-dev 2014-08-06 17:19:40 +00:00
Fabrice Di Meglio
df77106e94 Fix bug #16712121 Add 'Experimental' substring to 'High contrast text' 
- add "(Experimental)" as a summary text for "High contrast text"

Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
 2014-08-06 10:55:39 -07:00
Adrian Roos
23c5e2c020 am dac08901: am 774b4a62: am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 
* commit 'dac0890101d7b422a86fd98483d1dc69015b3943':
  Ask about redacted notifications after setting up a secure lock
 2014-08-06 01:46:55 +00:00
John Spurlock
af7b99e156 am a229de98: am 511cdef8: am 802ddf99: Settings: New application-level notification settings. 
* commit 'a229de9883cca049c882f688e918fc09764db67a':
  Settings: New application-level notification settings.
 2014-08-05 16:07:59 +00:00
John Spurlock
802ddf99f5 Settings: New application-level notification settings. 
- Convert the old application-level dialog to an activity.
 - Move the settings icon to the new activity (out of the list).
 - Add a custom application header, similar to the switch bar style.
 - Use the ubiquitous vector gear for the settings icon.
 - Migrate old checkboxes to switch prefs, add new summaries.
 - Remove obsolete artifacts.

Bug:16396715
Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
 2014-08-05 11:08:03 -04:00
Dan Sandler
4bdf8b498b Merge "Replace missing resource." into lmp-dev 2014-08-05 00:35:13 +00:00
Dan Sandler
a15e76d113 Replace missing resource. 
Bug: 16833578
Change-Id: I9ad1dc992577f6bfdc9d1201b6c13591a32f3fc8
 2014-08-06 13:53:25 -04:00
Adrian Roos
1f4049edfe Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev 2014-08-05 00:35:13 +00:00
Adrian Roos
6f60f7ed22 Ask about redacted notifications after setting up a secure lock 
Bug: 14437890
Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
 2014-08-05 20:54:47 +02:00
Sander Alewijnse
6a39bc68ae Merge "Prevent launcher switching in Settings app." into lmp-dev 2014-08-05 00:19:02 +00:00
Sander Alewijnse
cd40220372 Prevent launcher switching in Settings app. 
User won't be able to switch to launchers that do not support
managed profiles.
Additional explanation is shown in text under the name of the
launcher.

Bug:15099904

Change-Id: I12470bf396d41ef47d463ef42835964aacda9719
 2014-08-07 12:48:22 +01:00
Dianne Hackborn
dc77335eda Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-dev 2014-08-04 23:42:57 +00:00
Dianne Hackborn
c783d23d52 Fix issue #16537318: clarify voice interaction strings. 
Change-Id: I7e2c379e28447fa83ecf9c53b064d7917253b880
 2014-08-05 14:45:53 -07:00
Etan Cohen
d2db86fc4e am 8e1b39f1: am 75de12c2: am 572d2539: Radio Information UI for enabling/disabling debug settings of MO over VoLTE 
* commit '8e1b39f1365372ee201d1a5145561be9a5f1d3d9':
  Radio Information UI for enabling/disabling debug settings of MO over VoLTE
 2014-08-04 23:12:07 +00:00
Etan Cohen
572d253982 Radio Information UI for enabling/disabling debug settings of MO over VoLTE 
Change-Id: Ib05ff460ac6001c511113e80a63707a073908637
 2014-08-04 22:57:15 +00:00
Maurice Lam
f019b59266 am d76cce8b: am aa2c4979: am 86163b6b: Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 
* commit 'd76cce8ba6889f78c0e940b0933d7f608c2e6fee':
  [WifiSetup] Fixed setup strings CHAR LIMIT
 2014-08-04 22:23:29 +00:00
John Spurlock
262989cab6 am 4781e4a5: am 927b3dde: am 911de7fa: Settings: Wire up new doze opt-out setting. 
* commit '4781e4a5f9076f899738cdc91a523c98d41708b0':
  Settings: Wire up new doze opt-out setting.
 2014-08-04 19:13:59 +00:00
John Spurlock
911de7fa85 Settings: Wire up new doze opt-out setting. 
Add an item in Display settings for enabling or disabling
dozing.  The setting will only appear on devices that have
configured a doze component.

Bug:16703536
Change-Id: Iba5f0a25cef68924f5be5f858b4c396234a7a355
 2014-08-04 14:53:28 -04:00
PauloftheWest
2621d33175 am 219a65cc: am 00265787: am 386e5ebb: Updated comments in strings.xml for translators. 
* commit '219a65cc0808e567a4ceff8d41197d3dae44207c':
  Updated comments in strings.xml for translators.
 2014-08-03 20:45:52 +00:00
PauloftheWest
386e5ebbc2 Updated comments in strings.xml for translators. 
Bug: 16321904
Bug: 16340357
Change-Id: I5e4a854742a1f4e51c7aed2e786b2436260795ec
 2014-08-03 19:50:22 +00:00
John Spurlock
99089e8990 am b86bd00a: am 0062d87a: am 249cf50b: Settings: Battery saver updates. 
* commit 'b86bd00a8862c6185fad1815345af662869fb68e':
  Settings: Battery saver updates.
 2014-08-03 02:02:21 +00:00
John Spurlock
249cf50b19 Settings: Battery saver updates. 
- Fewer trigger level options, new default of 0 (never)
 - Use new shared feature description text (in framework)
 - Remove "always on", add new top-level switch bar.

Depends on the framework changes in I3d1ded1eec9e63e7d97469486f6a320e1bebbccd

Bug:16214395
Change-Id: Ia01186cfeb19d00672f62cc84787584b4dcc1143
 2014-08-02 17:23:46 -04:00
Zoltan Szatmary-Ban
b0a3e71e01 am 11ea340c: am 5120b21e: am f3d72098: Update Device Admins Settings screen 
* commit '11ea340c59abb7e521e6c9ad5250a5e28cbdb331':
  Update Device Admins Settings screen
 2014-08-01 20:59:20 +00:00
PauloftheWest
09db4fefd4 am dbaad4f9: am 3eb8a711: am 33734f58: Cheanged Call Manager\'s summary to be parameter. 
* commit 'dbaad4f99b70dfcc3aaf08d5e00852747afd08ee':
  Cheanged Call Manager's summary to be parameter.
 2014-08-01 20:59:16 +00:00
Amith Yamasani
e80f81accf am d1b5c1de: am f1602f81: am 9980cf7c: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev 
* commit 'd1b5c1deac126728c970e806e8bcfc04ac6bb87b':
  Dialog on phone shouldn't say tablet
 2014-08-01 20:59:14 +00:00
Zoltan Szatmary-Ban
f3d72098b0 Update Device Admins Settings screen 
The MDM is a Device Admin for the managed profile. The users should be able to see that it exists
and it is controlling the device, but they should not be able to change it.

Bug: 15558397

Change-Id: Ief372b606f1085f73c98ace97f2c1d9ac5fe3257
 2014-08-01 09:29:33 +00:00
Maurice Lam
86163b6bcd Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev 2014-08-01 08:29:25 +00:00
Maurice Lam
a6e7f3dd93 [WifiSetup] Fixed setup strings CHAR LIMIT 
Bumped the CHAR LIMIT of "Skip" button to 20, and added the same CHAR
LIMIT to "Next".

Bug: 16116325
Change-Id: Iafdab3712fdbfac0c53d3ef73d1da8910bc9433b
 2014-08-04 15:11:33 -07:00