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
75de12c2d6
am 572d2539
: Radio Information UI for enabling/disabling debug settings of MO over VoLTE
...
* commit '572d25398297049a4da3042d58b1ccecf3514e4d':
Radio Information UI for enabling/disabling debug settings of MO over VoLTE
2014-08-04 23:00:46 +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
aa2c49799f
am 86163b6b
: Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-dev
...
* commit '86163b6bcd8da9ea77ef6a3f3cf84ab31780246d':
[WifiSetup] Fixed setup strings CHAR LIMIT
2014-08-04 22:15:16 +00:00
John Spurlock
927b3dde46
am 911de7fa
: Settings: Wire up new doze opt-out setting.
...
* commit '911de7fa8520f919cda673ae70c25f86ae0edf98':
Settings: Wire up new doze opt-out setting.
2014-08-04 19:06:10 +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
0026578738
am 386e5ebb
: Updated comments in strings.xml for translators.
...
* commit '386e5ebbc274ee18e8f4fb00bc51212a0b764ad7':
Updated comments in strings.xml for translators.
2014-08-03 20:39:02 +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
0062d87ae3
am 249cf50b
: Settings: Battery saver updates.
...
* commit '249cf50b19c5b1d9ddce0667fb9d439fcdb6f033':
Settings: Battery saver updates.
2014-08-03 01:54: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
5120b21eeb
am f3d72098
: Update Device Admins Settings screen
...
* commit 'f3d72098b0008a9a8e137985d7fbc0e0470adc9c':
Update Device Admins Settings screen
2014-08-01 11:51:26 +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
3eb8a711fe
am 33734f58
: Cheanged Call Manager\'s summary to be parameter.
...
* commit '33734f58d5894829c5821c39727f6dae2c951167':
Cheanged Call Manager's summary to be parameter.
2014-07-31 22:33:52 +00:00
PauloftheWest
33734f58d5
Cheanged Call Manager's summary to be parameter.
...
Bug: 16300328
Change-Id: I4a3a4a80060ac6d464adc5f666d02dabe635707c
2014-07-31 22:27:16 +00:00
Svetoslav
f66c67db46
am 0b4cf144
: Merge "Removing lock screen app widget code" into lmp-dev
...
* commit '0b4cf14400a42a3d0f461386f22d3dd7d69dd88f':
Removing lock screen app widget code
2014-07-31 21:55:09 +00:00
Amith Yamasani
f1602f811a
am 9980cf7c
: Merge "Dialog on phone shouldn\'t say tablet" into lmp-dev
...
* commit '9980cf7c9927451b1370dab8afb8357542c10e8c':
Dialog on phone shouldn't say tablet
2014-07-31 20:52:42 +00:00
Alexandra Gherghina
9aaa3af4b5
am 6bcca8b7
: Modify user spinner appearance to match mocks
...
* commit '6bcca8b7ae3fab4609f67f32a52a10d4143093a9':
Modify user spinner appearance to match mocks
2014-07-31 18:43:06 +00:00
Alexandra Gherghina
ea01d4062f
am 6b3b7514
: Update icon and text for a managed profile
...
* commit '6b3b751492d01b23b87a4ee6b807dc00c3b5770e':
Update icon and text for a managed profile
2014-07-31 13:07:02 +00:00
Alexandra Gherghina
6bcca8b7ae
Modify user spinner appearance to match mocks
...
Bug: 16518801
Change-Id: I30aa65251d4a4aaa80dbde5881fc56fffb7d54f7
2014-07-31 11:31:24 +01: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
Geoff Mendal
86bf735aae
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-30 19:31:16 +00:00
Geoff Mendal
a7a08fd726
Import translations. DO NOT MERGE
...
Change-Id: I1b93e4357544ff5ce9bf18351ed34009ba06c5f5
Auto-generated-cl: translation import
2014-07-30 18:31:14 -07:00
Elliott Hughes
6d5c0e411c
am 3ded7ddb
: Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-dev
...
* commit '3ded7ddb1f54045842bbea8ea03e939443d17808':
Work around an icu4c bug in TimeZoneNames::getDisplayName.
2014-07-30 18:55:09 +00:00
John Spurlock
a5638b0c87
am d117a96e
: Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev
...
* commit 'd117a96e00ab2df2d523e4a62825cf90851dc342':
Settings: Fix ordering for interruptions alarm warning.
2014-07-30 16:38:45 +00:00
PauloftheWest
33c02c981b
am 361d870e
: Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
...
* commit '361d870e5415f8642cb106b4329d194673b4dd02':
Added ability for user to automatically accept/deny Bluetooth Phonebook Syncs
2014-07-30 16:19:48 +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
Alexandra Gherghina
2653fe3c0f
am c8a1db19
: Toggle between primary and managed profile in apps settings
...
* commit 'c8a1db191207e38b7ad0acdfd276651e4911e812':
Toggle between primary and managed profile in apps settings
2014-07-30 12:58:32 +00: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
Fabrice Di Meglio
4b3e46ea18
am 5c14856b
: Merge "Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev
...
* commit '5c14856ba2cafeb00080355f7613a702779ca530':
Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)
2014-07-30 01:10:20 +00:00
Fabrice Di Meglio
7bdfe7fb83
am 6d9a59f0
: Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev
...
* commit '6d9a59f02df1bb9fae5974c510cd3eedf90fa5ce':
Fix bug #16660819 Switchbar text should be white not grey
2014-07-30 01:10:14 +00:00
Amith Yamasani
736ea0e8a8
am ba9643b9
: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
...
* commit 'ba9643b92c6fa481152f55b862442f609c1e7410':
Implement SET_PROFILE_OWNER intent
2014-07-29 23:47:00 +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
Fabrice Di Meglio
c13c0bd5dd
am d5ec63ad
: Merge "Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev
...
* commit 'd5ec63ad5166b2a6530c2958819a053cccf4ec79':
Fix bug #16382239 "Searching for Printers" progress bar is not Material / Quantum
2014-07-29 17:24:31 +00:00
Alexandra Gherghina
6d09e061ef
am 4a45be2f
: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
...
* commit '4a45be2ff83e1b3b9bd52be523639d100311bec3':
Move global sync settings dialogs to the right screen
2014-07-29 15:31:48 +00:00
Zoltan Szatmary-Ban
b77ef9bee2
am 74f34e49
: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
...
* commit '74f34e496fc460842aa558512de03187f5ad9b2c':
Update Data Usage Settings for Enterprise
2014-07-29 12:49:27 +00:00
Alexandra Gherghina
76cc239fba
am fe47a8dc
: Toggle between primary and managed profile in Print Settings
...
* commit 'fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
Toggle between primary and managed profile in Print Settings
2014-07-29 12:49:25 +00:00
Alexandra Gherghina
fe47a8dc89
Toggle between primary and managed profile in Print Settings
...
This adds a spinner to the print settings 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: I2556a331d09379c2a501bc6b192ab1631b5215f5
2014-07-29 10:22:15 +01:00
Fabrice Di Meglio
bbd076c1f3
am 173e3161
: Merge "Some code formatting" into lmp-dev
...
* commit '173e31619a34436e8cb100fb30f0e3477b7edf8e':
Some code formatting
2014-07-29 01:03:58 +00:00
Alan Viverette
6c27489f40
am 744c6b22
: Remove TimePicker and DatePicker dialog themes
...
* commit '744c6b22513f3b51f035b2038a59d35c97c4da6c':
Remove TimePicker and DatePicker dialog themes
2014-07-29 00:47:58 +00:00
Alan Viverette
744c6b2251
Remove TimePicker and DatePicker dialog themes
...
Also moves TimePicker widget style to appropriate XML file / namespace.
BUG: 14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
2014-07-29 00:06:20 +00:00
Fabrice Di Meglio
90bfe0cf7e
am d197608e
: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
...
* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
2014-07-28 23:15:47 +00:00
Fabrice Di Meglio
173e31619a
Merge "Some code formatting" into lmp-dev
2014-07-28 22:45:16 +00:00
Fabrice Di Meglio
9e041f02ec
Some code formatting
...
- add some extra lines into those XML layout files
Change-Id: I13c004f23a5c59d46702a93b1cfa7e9b9587b8c2
2014-07-28 17:54:30 -07:00
Fabrice Di Meglio
1d5b910f1c
Fix bug #14323097 Launching Security from Settings search results
...
...show header as Settings instead of Security
- add missing title to a few fragments
Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
2014-07-28 15:47:21 -07:00