Clara Bayarri
4ad57ab159
Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev
2016-03-02 19:36:17 +00:00
Julia Reynolds
60e90ac07c
Allow notifications be to hidden from the lockscreen by app.
...
Bug: 26642033
Change-Id: I932defebe00c566c0a930a0cabc118238c349272
2016-03-02 14:20:57 -05:00
Noah Wang
c5a62b4c54
Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev
...
am: d53c483e61
* commit 'd53c483e61c54977fa9150bb4f2b080172bfe575':
Remove spammy debug logging from MessageBubbleBackground.
2016-03-02 18:37:31 +00:00
Noah Wang
d53c483e61
Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev
2016-03-02 18:30:20 +00:00
Geoff Mendal
7c37b0c6e2
Import translations. DO NOT MERGE am: 5601cd43e8 -s ours
...
am: 74341dd8e8 -s ours
* commit '74341dd8e8c864cbde0dfe4648b25e0b056b1709':
Import translations. DO NOT MERGE
2016-03-02 17:22:35 +00:00
Clara Bayarri
bb91a99a80
Fix crash in ConfigureNotificationSettings
...
Bug: 27445698
Change-Id: I1d0f99731b0b5abe1b34c7dfab4daeecf236e889
2016-03-02 09:21:41 -08:00
Oleksandr Peletskyi
41d99408cb
Block "Screen lock" menu if password is managed.
...
"Screen lock" menu item is completely disabled in case, if
PASSWORD_QUALITY_MANAGED is set.
BUG: 25549437
Change-Id: I1958157946d29c013465e995af2226e061d5c726
2016-03-02 18:08:42 +01:00
Geoff Mendal
74341dd8e8
Import translations. DO NOT MERGE
...
am: 5601cd43e8 -s ours
* commit '5601cd43e8a8daf9147682fc15e0e1921d715d2c':
Import translations. DO NOT MERGE
2016-03-02 16:55:48 +00:00
Geoff Mendal
5601cd43e8
Import translations. DO NOT MERGE
...
Change-Id: I7fc9058af79321a65e11880ace9e808312799994
Auto-generated-cl: translation import
2016-03-02 07:37:57 -08:00
Geoff Mendal
2243bab839
Import translations. DO NOT MERGE
...
Change-Id: I70b3a73e267745f30b39b99f8628f1e26a4dc6c0
Auto-generated-cl: translation import
2016-03-02 06:33:19 -08:00
Fyodor Kupolov
8129f02e6a
Merge "Do not allow removing current user if it\'s in a call" into nyc-dev am: 664f94e07b
...
am: 4aa47a6426
* commit '4aa47a6426def58692e323df2d295edbafe53829':
Do not allow removing current user if it's in a call
2016-03-02 04:55:42 +00:00
Clara Bayarri
1d24d930d2
Merge "Add Work Challenge Notifications Setting" into nyc-dev am: fe3ac82dde
...
am: dd7efce298
* commit 'dd7efce298544f3b48939554dbb819030193de94':
Add Work Challenge Notifications Setting
2016-03-02 04:54:18 +00:00
Jason Monk
642d44d1c3
Merge "Wifi p2p fix?" into nyc-dev am: 770cb0069e
...
am: 208523d342
* commit '208523d3427158b9b1812591a087e817c89826bc':
Wifi p2p fix?
2016-03-02 04:52:57 +00:00
Clara Bayarri
c17fdaca54
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev am: 2753f88723
...
am: b888d3c9ae
* commit 'b888d3c9ae2cad1ed17b412eaf6f1ec9f7efc5fd':
Fixes for Work Challenge Fingerprint
2016-03-02 04:51:30 +00:00
Clara Bayarri
8de9c36b84
Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev am: 00fb7a5598
...
am: b78f20354e
* commit 'b78f20354ef22f949b145e9213dc2490a97b0857':
When un-unifying the personal and work locks, launch lock setup
2016-03-02 04:50:12 +00:00
Sudheer Shanka
a59635100f
Update custom widget layouts to have a restricted icon.
...
Bug: 25603665
Bug: 27263775
Change-Id: Ic80377229de977b6f7c5f653974e8f926fb8ac1d
2016-03-01 17:28:57 -08:00
Noah Wang
984c073454
Remove spammy debug logging from MessageBubbleBackground.
...
Bug: 27363534
Change-Id: If8ff8bf0540f4e031a9092026adce8296ef4b6e1
2016-03-01 15:53:30 -08:00
Anna Galusza
ec7b6a4e98
Change nav bar style.
...
Bug: 27226956
Change-Id: I16e2234e44bf1d22f8b41de9d28c35226152d0ee
2016-03-01 15:36:47 -08:00
Fyodor Kupolov
4aa47a6426
Merge "Do not allow removing current user if it\'s in a call" into nyc-dev
...
am: 664f94e07b
* commit '664f94e07bf5a91f5d4da29af5948a7e247779bd':
Do not allow removing current user if it's in a call
2016-03-01 23:30:39 +00:00
Clara Bayarri
dd7efce298
Merge "Add Work Challenge Notifications Setting" into nyc-dev
...
am: fe3ac82dde
* commit 'fe3ac82dde461cac7e3cd6f76474639bf368b647':
Add Work Challenge Notifications Setting
2016-03-01 23:30:18 +00:00
Jason Monk
208523d342
Merge "Wifi p2p fix?" into nyc-dev
...
am: 770cb0069e
* commit '770cb0069e2fd1a8a556c8df495fd5b1b7d0236b':
Wifi p2p fix?
2016-03-01 23:29:58 +00:00
Clara Bayarri
b888d3c9ae
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
...
am: 2753f88723
* commit '2753f88723bc9213c4df9763dddc27609c54e181':
Fixes for Work Challenge Fingerprint
2016-03-01 23:29:41 +00:00
Clara Bayarri
b78f20354e
Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev
...
am: 00fb7a5598
* commit '00fb7a559815f73f15f8e1ddd697f6ceca5ade1b':
When un-unifying the personal and work locks, launch lock setup
2016-03-01 23:29:24 +00:00
Fyodor Kupolov
664f94e07b
Merge "Do not allow removing current user if it's in a call" into nyc-dev
2016-03-01 23:21:27 +00:00
Clara Bayarri
fe3ac82dde
Merge "Add Work Challenge Notifications Setting" into nyc-dev
2016-03-01 23:11:59 +00:00
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
* commit '0f13792953dd361ffb3ef563d073b8d62d544755':
Fix CharSequence nonsense in NotificationStation.
2016-03-01 16:23:27 +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
a96c872f67
Merge "Data saver fixes" into nyc-dev am: 542f5d3e67
...
am: 02b652eba9
* commit '02b652eba9ca4deb80737ecfaa4cc570cd6a2803':
Data saver fixes
2016-03-01 16:01:02 +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
fe9c0ebcb1
Hide notification asst setting. am: 602e133e79
...
am: b755b16598
* commit 'b755b16598f956b7badd6ce69a2ebf58905dfbd1':
Hide notification asst setting.
2016-03-01 15:40:31 +00: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
3adcc09b06
Merge "Api review: AutomaticZenRule" into nyc-dev am: a20dff1ebf
...
am: fb366d9f34
* commit 'fb366d9f34df200040bb60fca177c076823db2e8':
Api review: AutomaticZenRule
2016-03-01 15:12:09 +00: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
8b8f6e4594
Merge "Make some Settings intent filters cross-profile again." into nyc-dev am: 8eb11e473d
...
am: bfe0dee0eb
* commit 'bfe0dee0eb3298be3aedaf779e850a6a166d43c7':
Make some Settings intent filters cross-profile again.
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
* 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
17c211a699
Fixed padding on "Take Bug Report" dialog. am: 2c9911f190
...
am: bbeb1fc842
* commit 'bbeb1fc842287267604d79cbac8c5c9057566d05':
Fixed padding on "Take Bug Report" dialog.
2016-03-01 02:39:00 +00: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