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
Dianne Hackborn
b8e0e338c4
am dc77335e: Merge "Fix issue #16537318 : clarify voice interaction strings." into lmp-dev
...
* commit 'dc77335eda0edee8e8a72d04155aacad91ddc12c':
Fix issue #16537318 : clarify voice interaction strings.
2014-08-06 01:13:15 +00:00
Adrian Roos
774b4a626a
am 1f4049ed: Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev
...
* commit '1f4049edfe1937ce19c7d93a5576ea03db83ad50':
Ask about redacted notifications after setting up a secure lock
2014-08-05 19:12:22 +00:00
John Spurlock
511cdef85d
am 802ddf99: Settings: New application-level notification settings.
...
* commit '802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe':
Settings: New application-level notification settings.
2014-08-05 15:13:07 +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
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
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
Geoff Mendal
f3dfd182e1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-05 00:34:22 +00:00
Geoff Mendal
c47db9c9fa
Import translations. DO NOT MERGE
...
Change-Id: If24e248354ae999208643fb8f91b0c0a9e7de233
Auto-generated-cl: translation import
2014-08-04 17:35:58 -07: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
Geoff Mendal
a0b87a2436
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-05 00:29:22 +00:00
Geoff Mendal
8e89e6d644
Import translations. DO NOT MERGE
...
Change-Id: I9d45348a4c9fab36e1c23ddf01b3c5c2cb535f56
Auto-generated-cl: translation import
2014-08-06 12:23:02 -07: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
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