Jason Monk
770cb0069e
Merge "Wifi p2p fix?" into nyc-dev
2016-03-01 20:43:58 +00:00
Jason Monk
6af0b9db4c
Wifi p2p fix?
...
Bug: 27431029
Change-Id: Ic9661dbb75d633d4b6e778cde796785aa33c04e0
2016-03-01 15:27:38 -05:00
Clara Bayarri
2753f88723
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
2016-03-01 18:22:55 +00:00
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
29e6a81605
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev am: c9a8abb538
...
am: 0f13792953
2016-03-01 16:23:27 +00:00
Dan Sandler
0f13792953
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
...
am: c9a8abb538
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
a96c872f67
Merge "Data saver fixes" into nyc-dev am: 542f5d3e67
...
am: 02b652eba9
2016-03-01 16:01:02 +00:00
Jason Monk
02b652eba9
Merge "Data saver fixes" into nyc-dev
...
am: 542f5d3e67
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
fe9c0ebcb1
Hide notification asst setting. am: 602e133e79
...
am: b755b16598
2016-03-01 15:40:31 +00:00
Julia Reynolds
b755b16598
Hide notification asst setting.
...
am: 602e133e79
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
3adcc09b06
Merge "Api review: AutomaticZenRule" into nyc-dev am: a20dff1ebf
...
am: fb366d9f34
2016-03-01 15:12:09 +00:00
Julia Reynolds
fb366d9f34
Merge "Api review: AutomaticZenRule" into nyc-dev
...
am: a20dff1ebf
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
8b8f6e4594
Merge "Make some Settings intent filters cross-profile again." into nyc-dev am: 8eb11e473d
...
am: bfe0dee0eb
2016-03-01 11:45:43 +00:00
Nicolas Prevot
bfe0dee0eb
Merge "Make some Settings intent filters cross-profile again." into nyc-dev
...
am: 8eb11e473d
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
17c211a699
Fixed padding on "Take Bug Report" dialog. am: 2c9911f190
...
am: bbeb1fc842
2016-03-01 02:39:00 +00:00
Felipe Leme
bbeb1fc842
Fixed padding on "Take Bug Report" dialog.
...
am: 2c9911f190
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
683f4cee61
Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev am: 445bd53e51
...
am: 897223ed3f
2016-02-29 19:57:33 +00:00
Anna Galusza
897223ed3f
Merge "Change Action Bar title in a11y SUW to match setting name. Bug: 27326637" into nyc-dev
...
am: 445bd53e51
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
0ea4357445
Resolve merge conflicts of b9e837bc78 to nyc-dev am: 7e6eec5b87
...
am: 71b73695bd
2016-02-29 19:17:57 +00:00
Sanket Padawe
71b73695bd
Resolve merge conflicts of b9e837bc78 to nyc-dev
...
am: 7e6eec5b87
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
bf075ebab0
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5a3dec0c40 -s ours
...
am: d9bd7b0324
2016-02-29 16:48:19 +00:00
Geoff Mendal
d9bd7b0324
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 5a3dec0c40
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
215f9cc594
Guard against apps with no permissions am: 01a4491600
...
am: 986e2e3adc
2016-02-29 15:06:18 +00:00
Jason Monk
986e2e3adc
Guard against apps with no permissions
...
am: 01a4491600
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
Geoff Mendal
b76274f9a3
Import translations. DO NOT MERGE
...
Change-Id: I7a1b8f0dd9b8f8a7b085a893e7bcb19ad4ccbac6
Auto-generated-cl: translation import
2016-02-29 06:32:57 -08: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
41bf597777
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
...
am: 7a5e279957
2016-02-29 10:44:59 +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
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
dbf871701d
Import translations. DO NOT MERGE am: 71dcb876e8 -s ours
...
am: 5b0380456b
2016-02-27 05:33:21 +00:00
Baligh Uddin
5b0380456b
Import translations. DO NOT MERGE
...
am: 71dcb876e8
2016-02-27 05:32:34 +00:00
Andy Hung
47c080546b
Merge changes from topic \'update mono audio\' into nyc-dev am: a77940d0f5
...
am: 9e59a51560
2016-02-27 02:56:41 +00:00
