Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,966 Commits 1 Branch 0 Tags
1ff86be2bd7e93dc94de0e33a0e79b6012ad711d
Commit Graph

3122 Commits

Author SHA1 Message Date
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
PauloftheWest
33734f58d5 Cheanged Call Manager's summary to be parameter. 
Bug: 16300328
Change-Id: I4a3a4a80060ac6d464adc5f666d02dabe635707c
 2014-07-31 22:27:16 +00:00
Alexandra Gherghina
34c135757d am 2d0e57dd: am ea01d406: am 6b3b7514: Update icon and text for a managed profile 
* commit '2d0e57ddaa72e83672eaa76f00ae3099e798d408':
  Update icon and text for a managed profile
 2014-07-31 13:42:32 +00:00
Alexandra Gherghina
6b3b751492 Update icon and text for a managed profile 
Bug: 16369104
Change-Id: I15d25910332d92e1638cdc63422e7e28c2f07d85
 2014-07-31 10:24:16 +00:00
John Spurlock
fdbee1a8e4 am d66e91de: am a5638b0c: am d117a96e: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 
* commit 'd66e91de2f98005a780e54d90dee15d519a5627d':
  Settings: Fix ordering for interruptions alarm warning.
 2014-07-30 17:11:25 +00:00
PauloftheWest
ce17442f40 am cc58d272: am 33c02c98: am 361d870e: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
* commit 'cc58d2722b69ee815b50e557b6c7f0f1cbca5d0d':
  Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
 2014-07-30 16:55:45 +00:00
Alexandra Gherghina
c205b1fe8b am 8fbbeb9e: am 2653fe3c: am c8a1db19: Toggle between primary and managed profile in apps settings 
* commit '8fbbeb9efda5f9a524e3abdaa7d5729bad44cea9':
  Toggle between primary and managed profile in apps settings
 2014-07-30 16:55:39 +00:00
Amith Yamasani
f2f9098e20 am 62a188e9: am 736ea0e8: am ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev 
* commit '62a188e98ff4c5f495e0a376bb481a71719200ac':
  Implement SET_PROFILE_OWNER intent
 2014-07-30 16:55:26 +00:00
PauloftheWest
361d870e54 Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs 
Bug: 16040292
Change-Id: Ieeaa014052f53787cf7057578e0b2ac048dc6eb1
 2014-07-30 08:39:46 -07:00
Amith Yamasani
9980cf7c99 Merge "Dialog on phone shouldn't say tablet" into lmp-dev 2014-07-30 11:24:38 +00:00
Amith Yamasani
9bfdeab948 Dialog on phone shouldn't say tablet 
Bug: 14607100
Change-Id: I5c3e023b94697f58c61122d530abaed406862201
 2014-07-31 13:29:42 -07:00
Alexandra Gherghina
c8a1db1912 Toggle between primary and managed profile in apps settings 
This adds a spinner to the apps screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.

Bug: 16369104
Change-Id: I09a94c07597e6509de025dfbbe0e454ae3d9b0aa
 2014-07-30 09:15:38 +00:00
John Spurlock
d117a96e00 Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev 2014-07-29 22:44:51 +00:00
John Spurlock
8ef00dfe4b Settings: Fix ordering for interruptions alarm warning. 
And update the string to the latest.

Bug:16662819
Change-Id: I42b38ab4721180babfd816a34a1fb1c368546cca
 2014-07-30 12:33:04 -04:00
Alexandra Gherghina
b4df7f3cc4 am ecd1fac9: am 6d09e061: am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev 
* commit 'ecd1fac93d6a1b6fa994d445fe7828b63a255362':
  Move global sync settings dialogs to the right screen
 2014-07-29 15:39:26 +00:00
Zoltan Szatmary-Ban
267b103348 am 7832c091: am b77ef9be: am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev 
* commit '7832c0913db9fa9cabdb3f78d6b6f54467798de5':
  Update Data Usage Settings for Enterprise
 2014-07-29 13:32:11 +00:00
Jeff Davidson
a117f13337 am 2eb61429: am 92126c1c: am 6207391a: Fix strings for Wi-Fi Assistant dialog. 
* commit '2eb61429f8593cc9b1dda6b1714e784d4c624c11':
  Fix strings for Wi-Fi Assistant dialog.
 2014-07-28 20:54:25 +00:00
Jeff Davidson
6207391ac2 Fix strings for Wi-Fi Assistant dialog. 
Remove some redundant strings that are no longer needed.

Change-Id: I039839989358efa322bac13129d91f7c764fd387
 2014-07-28 13:35:41 -07:00
PauloftheWest
a4cfc0f386 am 57043d83: am 7359836b: am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev 
* commit '57043d837e2a41dc6b8ae9c9bfe5dab95dd5441c':
  Minor character limit fixes for translation.
 2014-07-28 18:52:25 +00:00
PauloftheWest
27ac35f542 am bc83acc2: am 0314d6d6: am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev 
* commit 'bc83acc2ede2ea255a5d0c3fb280aaf5c51b389e':
  Fixed minor character limits for translation.
 2014-07-28 18:07:37 +00:00
Alexandra Gherghina
bb4b982efe am 0d05a314: am 3f0140ec: am 28ff0ff0: Update string displayed when we can\'t remove an account 
* commit '0d05a3145af8a612847ea9fbd26c3236c8cb07c6':
  Update string displayed when we can't remove an account
 2014-07-28 14:37:19 +00:00
Alexandra Gherghina
28ff0ff0f1 Update string displayed when we can't remove an account 
Bug: 14642886
Change-Id: Ie4a902cfd1ae41f2a1bae28432874e7b8b34b50d
 2014-07-28 15:24:34 +01:00