Clara Bayarri
462cce1a4c
Add Work Challenge Notifications Setting
...
Bug: 26844582
Change-Id: Ib1eb28cfebcc0c8d23ec8669f2777ccb822d7bf3
2016-03-01 10:22:05 -08:00
Clara Bayarri
eb8962d273
Fixes for Work Challenge Fingerprint
...
When enrolling fingerprints on both personal and work and then setting
the lock to none or swipe, the fingerprints for that user were not being
correctly removed due to wrong userIds being passed in.
Also fix the wipe dialog message as it was always querying whether the
main user has fingerprints instead of the user the dialog applies to.
Bug: 27263452, 27199237
Change-Id: I8d170e36f31b5595bc0bb41168a87db9f57eda2f
2016-03-01 10:22:05 -08:00
Clara Bayarri
00fb7a5598
Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev
2016-03-01 18:07:41 +00:00
Dan Sandler
0f13792953
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
...
am: c9a8abb538
* commit 'c9a8abb5382fdda41876b25dd6ed0ebfb58dc0b2':
Fix CharSequence nonsense in NotificationStation.
2016-03-01 16:20:41 +00:00
Daniel Sandler
c9a8abb538
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
2016-03-01 16:19:25 +00:00
Jason Monk
02b652eba9
Merge "Data saver fixes" into nyc-dev
...
am: 542f5d3e67
* commit '542f5d3e676df752b27712ba919dde6ca07f3064':
Data saver fixes
2016-03-01 15:58:20 +00:00
Jason Monk
542f5d3e67
Merge "Data saver fixes" into nyc-dev
2016-03-01 15:55:11 +00:00
Jason Monk
a8b0366a02
Data saver fixes
...
- Correct summary for number of apps with unrestricted
- Show system option on unrestricted access page
- general betterness
Bug: 26796370
Bug: 27378294
Bug: 27122309
Change-Id: Ia57b56a25175182cb1a5a1231c20dc3c71cc3427
2016-03-01 10:44:16 -05:00
Julia Reynolds
b755b16598
Hide notification asst setting.
...
am: 602e133e79
* commit '602e133e79c68216756ac897e762497ea8747cd0':
Hide notification asst setting.
2016-03-01 15:38:45 +00:00
Julia Reynolds
602e133e79
Hide notification asst setting.
...
Bug: 22960980
Change-Id: If9f28e3944d6a3a450d2607448be9ec25fdcdb85
2016-03-01 10:20:36 -05:00
Julia Reynolds
fb366d9f34
Merge "Api review: AutomaticZenRule" into nyc-dev
...
am: a20dff1ebf
* commit 'a20dff1ebf9acdec8efdc244aef1128e38921fe5':
Api review: AutomaticZenRule
2016-03-01 15:08:55 +00:00
Julia Reynolds
a20dff1ebf
Merge "Api review: AutomaticZenRule" into nyc-dev
2016-03-01 15:05:34 +00:00
Nicolas Prevot
bfe0dee0eb
Merge "Make some Settings intent filters cross-profile again." into nyc-dev
...
am: 8eb11e473d
* commit '8eb11e473d6bd42119bb349812cc39ce0c5d5879':
Make some Settings intent filters cross-profile again.
2016-03-01 11:44:00 +00:00
Nicolas Prévot
8eb11e473d
Merge "Make some Settings intent filters cross-profile again." into nyc-dev
2016-03-01 11:42:49 +00:00
Dan Sandler
8b797c2df8
Fix CharSequence nonsense in NotificationStation.
...
Also clean up the lifecycle so we unbind and rebind on pause
and resume, instead of create and destroy.
Bug: 27389947
Change-Id: I2b7b7934a25a6bd528b9d399ffed487ea724b30b
2016-02-29 22:29:10 -05:00
Felipe Leme
bbeb1fc842
Fixed padding on "Take Bug Report" dialog.
...
am: 2c9911f190
* commit '2c9911f1905aea2a01fc04040e7d7a1b17b94987':
Fixed padding on "Take Bug Report" dialog.
2016-03-01 02:28:13 +00:00
Clara Bayarri
4a91408698
When un-unifying the personal and work locks, launch lock setup
...
When the user decides to have a separate work lock, it makes sense
to send them to set up that lock directly. Also fixes the issue where
we have work fingerprints in a unified state and un-unifying leaves
the work profile with no lock but fingerprints.
Bug: 27199237
Change-Id: I85dab9cdf993af69a661d8f0cd4ad2449a348cac
2016-02-29 17:57:56 -08:00
Felipe Leme
2c9911f190
Fixed padding on "Take Bug Report" dialog.
...
BUG: 26324085
Change-Id: If716066d8ebf35e4fb398e7a423c808abd6a159e
2016-02-29 17:21:44 -08:00
Anna Galusza
897223ed3f
Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev
...
am: 445bd53e51
* commit '445bd53e5176f6140779284b6cc3110b06722ca5':
Change Action Bar title in a11y SUW to match setting name. Bug: 27326637
2016-02-29 19:51:18 +00:00
Anna Galusza
445bd53e51
Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev
2016-02-29 19:47:15 +00:00
Anna Galusza
e87a2c21ff
Change Action Bar title in a11y SUW to match setting name.
...
Bug: 27326637
Change-Id: Ifddabdfef75707d5cdc164b4415e830539fd962a
2016-02-29 11:45:24 -08:00
Sanket Padawe
71b73695bd
Resolve merge conflicts of b9e837bc78
to nyc-dev
...
am: 7e6eec5b87
* commit '7e6eec5b87ba5ba34f63f7ba99ad911d54729d87':
Remove displaying of WifiCalling twice in Settings search.
2016-02-29 19:14:52 +00:00
Sanket Padawe
7e6eec5b87
Resolve merge conflicts of b9e837bc78
to nyc-dev
...
+ Fix merge conflict fromm mm-wireless-dev to nyc-dev
Change-Id: I8a604cec65bbe5ed61262771c9fe0489798425ed
2016-02-29 10:48:51 -08:00
Sanket Padawe
b9e837bc78
Merge "Remove displaying of WifiCalling twice in Settings search." into mm-wireless-dev
2016-02-29 18:23:56 +00:00
Geoff Mendal
d9bd7b0324
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 5a3dec0c40
-s ours
* commit '5a3dec0c401cd7c3c5bada1cc9da2a57b91fec7f':
Import translations. DO NOT MERGE
2016-02-29 16:46:40 +00:00
Geoff Mendal
5a3dec0c40
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-29 16:46:02 +00:00
Geoff Mendal
baadb43627
Import translations. DO NOT MERGE
...
Change-Id: I75e4543568e4d74a1cd3804a04ea13d49eb6a6d1
Auto-generated-cl: translation import
2016-02-29 07:37:40 -08:00
Jason Monk
986e2e3adc
Guard against apps with no permissions
...
am: 01a4491600
* commit '01a44916003ebdff399406405548c6058b114c5a':
Guard against apps with no permissions
2016-02-29 15:04:44 +00:00
Jason Monk
01a4491600
Guard against apps with no permissions
...
Bug: 27355802
Change-Id: Iee8d9898af0e5910319cb47218ceee8da1352554
2016-02-29 09:55:19 -05:00
Nicolas Prevot
aea1702338
Make some Settings intent filters cross-profile again.
...
The intents:
INPUT_METHOD_SETTINGS, MANAGE_DEFAULT_APPS_SETTINGS and HOME_SETTINGS
were not handled in the parent any more. Handle them in the parent.
BUG:27240411
Change-Id: I42da3ce37901ba3e9f5c8004db53e49bc2f9ed24
2016-02-29 13:49:31 +00:00
shwetachahar
7a5e279957
Merge "Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings." into nyc-dev
...
am: b17a56e07f
* commit 'b17a56e07fcd127a900c7030499b3328dc87237d':
Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings.
2016-02-29 10:41:47 +00:00
Shweta Chahar
b17a56e07f
Merge "Set the layout of seekbar as the preference_iconless_slider and remove the higher speech rate preference variables. The layout is changed to preference_iconless_slider so that the speech rate slider layout is same as the layout of seekbars in android settings." into nyc-dev
2016-02-29 10:39:29 +00:00
Baligh Uddin
5b0380456b
Import translations. DO NOT MERGE
...
am: 71dcb876e8
-s ours
* commit '71dcb876e8d0722f9410e95ab69df9fc5a151a55':
Import translations. DO NOT MERGE
2016-02-27 05:32:34 +00:00
Andy Hung
9e59a51560
Merge changes from topic \'update mono audio\' into nyc-dev
...
am: a77940d0f5
* commit 'a77940d0f5ca5bc16b352dbcc026684e738a2d2c':
Add mono audio to AccessibilitySettings
Remove mono audio from SoundSettings
2016-02-27 02:55:47 +00:00
Andy Hung
a77940d0f5
Merge changes from topic 'update mono audio' into nyc-dev
...
* changes:
Add mono audio to AccessibilitySettings
Remove mono audio from SoundSettings
2016-02-27 02:50:06 +00:00
Baligh Uddin
71dcb876e8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: I5aa09746314d0401283206a7d59a802e752a85a6
2016-02-26 18:46:30 -08:00
Julia Reynolds
1d33d59be2
Api review: AutomaticZenRule
...
Bug: 27364144
Change-Id: Ic0ea5d4958711cf5216e87ad8054460ad4246856
2016-02-26 18:38:50 -05:00
Andy Hung
acef55d099
Add mono audio to AccessibilitySettings
...
Bug: 15283594
Change-Id: If5ca14a800e1932b17ef479589beb8a5d1489b5d
2016-02-26 14:35:09 -08:00
Andy Hung
f892e21696
Remove mono audio from SoundSettings
...
Mono audio will move to AccessibilitySettings only.
This reverts commit 0863ea40cd
.
Bug: 15283594
Change-Id: I2cc744c96a9f6a6454b0bf533a44bb2eb56b745a
2016-02-26 14:17:29 -08:00
Yohei Yukawa
edbcfde9a4
Handle the case where no spell checker is selected.
...
am: 1ea368b5d5
* commit '1ea368b5d5e353110eb131579b8eda00b4e35c59':
Handle the case where no spell checker is selected.
2016-02-26 18:55:42 +00:00
Yohei Yukawa
1ea368b5d5
Handle the case where no spell checker is selected.
...
This follows up to a previous CL [1] that fixed Bug 26685795 that the
Settings app crashes when no spell checker is selected, but introduced
another Bug 26686710 that the user cannot re-select the spell checker
once the device has fallen into that state because the button to select
new spell checker is disabled.
This CL tries to deal with such a case more carefully and gracefully, by
adding more null checking and by showing a meaningful text
("Not selected" for English) to users when no spell checker is currently
selected.
[1]: I65e6d269572e064aa6897807b6611ef947d90211
093a646772
Bug: 26108333
Bug: 26685795
Bug: 26686710
Change-Id: I0ed71bbb580e3547d97e321799ac2b77b1f284a3
2016-02-26 18:12:43 +00:00
Julia Reynolds
09da802710
Merge "Introduce IMPORTANCE_MIN." into nyc-dev
...
am: c2bcc727d9
* commit 'c2bcc727d9a43dc5f43574c7558f28ca9b798533':
Introduce IMPORTANCE_MIN.
2016-02-26 16:17:53 +00:00
Julia Reynolds
c2bcc727d9
Merge "Introduce IMPORTANCE_MIN." into nyc-dev
2016-02-26 16:14:33 +00:00
Jason Monk
447ad113df
Workarounds to avoid removing all prefs
...
am: 2071eda150
* commit '2071eda150c4ade320fa91ec99678114afbd223e':
Workarounds to avoid removing all prefs
2016-02-26 16:05:35 +00:00
Jason Monk
2071eda150
Workarounds to avoid removing all prefs
...
Removing all prefs causes ugly animations, so avoid it at all cost
and cache all the prefs (while still added) as long as possible.
Bug: 26271353
Change-Id: I33b84d751938b460f4b66c0158057407dd45d974
2016-02-26 11:00:01 -05:00
shwetachahar
6426435b4c
Set the layout of seekbar as the preference_iconless_slider
...
and remove the higher speech rate preference variables.
The layout is changed to preference_iconless_slider so that the speech
rate slider layout is same as the layout of seekbars in android
settings.
Bug: 27136737
Change-Id: Ib75b8dec74ef07be87130a3f29249b148f4bcf0b
2016-02-26 15:09:52 +00:00
Adrian Roos
1c7891f22b
Merge "Fix crash when changing encrypt with credential" into nyc-dev
...
am: 6c09bd2538
* commit '6c09bd2538f9b5474a3d0b38c46f1216c660d71d':
Fix crash when changing encrypt with credential
2016-02-26 00:18:52 +00:00
Adrian Roos
6c09bd2538
Merge "Fix crash when changing encrypt with credential" into nyc-dev
2016-02-26 00:11:07 +00:00
Adrian Roos
77181e9478
Fix crash when changing encrypt with credential
...
Bug: 27173979
Change-Id: If8ef7a9342bcb1b0602791df1dc7634b3e980ee7
2016-02-25 15:43:50 -08:00
Philip P. Moltmann
e1f50ab779
Do not count print jobs if printing is not available.
...
am: 24264eb250
* commit '24264eb2508d54de473b00b934807d2a0881b0aa':
Do not count print jobs if printing is not available.
2016-02-25 22:32:35 +00:00