Jason Monk
0ec94e0064
Merge "String refinements touch -> tap"
2016-02-03 19:11:52 +00:00
Jason Monk
ebfcadc8b8
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am: 8cb4301b59
...
am: bf942b7e11
* commit 'bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
2016-02-03 18:55:48 +00:00
Jason Monk
bf942b7e11
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
...
am: 8cb4301b59
* commit '8cb4301b59f95bff09526c32b30ecde396e164f7':
Change receiver name attribute for DISCOVERABLE_TIMEOUT
2016-02-03 18:53:44 +00:00
Jason Monk
8cb4301b59
Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"
2016-02-03 18:48:27 +00:00
Jason Monk
12fc8f6cff
String refinements touch -> tap
...
Bug: 26562712
Change-Id: I8435f11e58098ec5eafad6204bc5426fe67205ab
2016-02-03 13:31:38 -05:00
Jason Monk
70e1b41f5a
Merge "Broadscale logging for Settings"
2016-02-03 18:09:41 +00:00
Udam Saini
662c90aa48
Merge "Start redaction activity after we finish current activity."
2016-02-03 17:54:16 +00:00
Geoff Mendal
aac74a51da
Import translations. DO NOT MERGE am: 10a758b8b7 -s ours am: 3abb7c0351 -s ours
...
am: 4de59d3cdf -s ours
* commit '4de59d3cdfe375dc3f84a9e83e2130b494682031':
Import translations. DO NOT MERGE
2016-02-03 17:19:25 +00:00
Geoff Mendal
7d18fc6d2e
Import translations. DO NOT MERGE am: dd33e41c5a -s ours
...
am: 2e3f763b9c -s ours
* commit '2e3f763b9c715baa0610c8d5d52d1cfa4f72fb2c':
Import translations. DO NOT MERGE
2016-02-03 17:19:05 +00:00
Geoff Mendal
4de59d3cdf
Import translations. DO NOT MERGE am: 10a758b8b7 -s ours
...
am: 3abb7c0351 -s ours
* commit '3abb7c035126e7150d90c45c18c155547b3e2a66':
Import translations. DO NOT MERGE
2016-02-03 16:57:07 +00:00
Geoff Mendal
2e3f763b9c
Import translations. DO NOT MERGE
...
am: dd33e41c5a -s ours
* commit 'dd33e41c5a722548027919efdb70b282505e328a':
Import translations. DO NOT MERGE
2016-02-03 16:45:28 +00:00
Geoff Mendal
3abb7c0351
Import translations. DO NOT MERGE
...
am: 10a758b8b7 -s ours
* commit '10a758b8b7869726a70b2d8fa01221ade1e48181':
Import translations. DO NOT MERGE
2016-02-03 16:36:53 +00:00
Oleksandr Peletskyi
0581f91a75
Merge "Gray out Wallpapers menu item when setting of wallpapers is not allowed. BUG: 24890474"
2016-02-03 15:45:09 +00:00
Geoff Mendal
dd33e41c5a
Import translations. DO NOT MERGE
...
Change-Id: Ic601f7d4be7b8329b5092836469cfaf352d3ac45
Auto-generated-cl: translation import
2016-02-03 07:43:34 -08:00
Geoff Mendal
10a758b8b7
Import translations. DO NOT MERGE
...
Change-Id: I3d3c5d3b41843dab533b33325e67de3de8a88440
Auto-generated-cl: translation import
2016-02-03 07:34:47 -08:00
Sudheer Shanka
0b3fbf5d66
Merge "Add padlocks to more preferences that can be disabled by admin."
2016-02-03 15:31:57 +00:00
Geoff Mendal
b658590528
Import translations. DO NOT MERGE
...
Change-Id: I8f300745f44ddf8d429aa27beba2fc34bf8c9d49
Auto-generated-cl: translation import
2016-02-03 06:44:39 -08:00
Robin Lee
aa13caa986
Merge "Use MetricsEvent.USER_CREDENTIALS"
2016-02-03 13:02:05 +00:00
Udam Saini
686ae494f4
Start redaction activity after we finish current activity.
...
This is needed so that activity manager won't start a new task stack.
During setup, we want everything on the same task stack to allow
task locking.
Change-Id: Iaa1e13da8251ad37362ea41b374300268b6e9875
2016-02-02 17:02:29 -08:00
Udam Saini
dbc5ce1eee
Merge "Allows user to skip fingerprint during setup"
2016-02-03 01:02:08 +00:00
Sudheer Shanka
ec1052dbad
Add padlocks to more preferences that can be disabled by admin.
...
Bug: 26899715
Bug: 26767574
Bug: 26768057
Change-Id: I2dc590833cbee1e35047002ef554432f10ddc654
2016-02-03 00:24:52 +00:00
Paul Lawrence
446b78cd52
Merge "Don't show 'unlock at boot' for file encryption"
2016-02-02 21:54:06 +00:00
Noah Wang
b9c70a11f2
Merge "Replace SeekBar with LabeledSeekBar for Accessibility-related settings in order to adjust the nonsense read-out by talkback."
2016-02-02 20:36:47 +00:00
Noah Wang
2030f45f8f
Replace SeekBar with LabeledSeekBar for Accessibility-related settings
...
in order to adjust the nonsense read-out by talkback.
Change-Id: I5d2d333c045c3753784b01f731e68918d1175241
2016-02-02 12:28:23 -08:00
Ritesh Reddy
db7e0666ca
Merge "Calling dataChanged() for Net Policy Restrictions" into mm-wireless-dev
...
am: d2846524a0
* commit 'd2846524a0aadd8c575f34a80c99823765a7342d':
Calling dataChanged() for Net Policy Restrictions
2016-02-02 20:14:34 +00:00
Ritesh Reddy
d2846524a0
Merge "Calling dataChanged() for Net Policy Restrictions" into mm-wireless-dev
2016-02-02 20:11:46 +00:00
Julia Reynolds
e6d82b8d2f
Merge "Clarify notification blocking in notification app list."
2016-02-02 19:46:35 +00:00
Ritesh Reddy
b641615978
Calling dataChanged() for Net Policy Restrictions
...
Calling BackupManager.dataChanged() to stage the
backup when an option is changed.
Change-Id: I24419f8c71762aae6d1a087479faa8be9062546e
2016-02-02 19:43:25 +00:00
Jeremy Klein
42320452f8
Merge "Add unit tests for TetherService."
2016-02-02 19:41:10 +00:00
Jeremy Klein
f6b6713d77
Add unit tests for TetherService.
...
BUG: 26247383
Change-Id: I07ce14f4a2726e35b8b5665a3e0a8df7af864b3b
2016-02-02 11:18:28 -08:00
Samuel Tan
3848ddc1a0
Allow domain suffix match to be set in UI for EAP configurations
...
am: d54bbd5193
* commit 'd54bbd519303b8eb0a7822cea00c55ef5e4f6652':
Allow domain suffix match to be set in UI for EAP configurations
2016-02-02 18:59:52 +00:00
Udam Saini
56a0a55ef0
Merge "Updates fingerprint icon and text for suggested activities"
2016-02-02 18:50:38 +00:00
Udam Saini
861210c290
Allows user to skip fingerprint during setup
...
bug:26906231
Change-Id: Ibc73f2dad01b82f93d92a9351693a221cbe8cf6e
2016-02-02 10:49:16 -08:00
Udam Saini
aafbba10ec
Updates fingerprint icon and text for suggested activities
...
bug:25246207
Change-Id: I91669448c140b565d37563002a3ccbfb211d283b
2016-02-02 10:33:40 -08:00
Julia Reynolds
e07f385ae0
Clarify notification blocking in notification app list.
...
Change summary to: Normal (nothing blocked), Partially blocked
(at least one topic blocked), or Totally blocked (entire app
blocked).
Allow filtering on apps that are partially or totally blocked.
Bug: 26882239
Change-Id: I29924147a97a3d1693b0286d48905485e11edf1d
2016-02-02 12:52:24 -05:00
Mihai Niță
13c3b77dec
Merge "Using a real Button widget for "Add a language""
2016-02-02 17:40:31 +00:00
Benjamin Franz
6d417b1189
Merge "Revert "Revert "Read default confirm credentials title from policy"""
2016-02-02 17:14:07 +00:00
Mihai Nita
615659c86b
Using a real Button widget for "Add a language"
...
The initial implementation used a TextView.
But this is cleaner, it is a real button and acts like one.
Bug: 26756569
Change-Id: Ibe3550b0cb81b020dfd4ec6ab29d39a56ba6e1bd
2016-02-02 09:02:05 -08:00
Geoff Mendal
05ca390f6e
Import translations. DO NOT MERGE am: 49a9587ade -s ours am: 1b2a3b18fc -s ours
...
am: 649bbf765d -s ours
* commit '649bbf765d5bed3b0446b165aa01fa1b6500d229':
Import translations. DO NOT MERGE
2016-02-02 17:01:34 +00:00
Geoff Mendal
605bccff7a
Import translations. DO NOT MERGE am: 0873f057db -s ours
...
am: 83f0595b6e -s ours
* commit '83f0595b6ec645e033c9638e358bc9d4fe4b3010':
Import translations. DO NOT MERGE
2016-02-02 16:58:34 +00:00
Geoff Mendal
649bbf765d
Import translations. DO NOT MERGE am: 49a9587ade -s ours
...
am: 1b2a3b18fc -s ours
* commit '1b2a3b18fc871fddff6795c24802037c4fb4239a':
Import translations. DO NOT MERGE
2016-02-02 16:56:24 +00:00
Geoff Mendal
1b2a3b18fc
Import translations. DO NOT MERGE
...
am: 49a9587ade -s ours
* commit '49a9587aded906c32cde763ad263e4166913c824':
Import translations. DO NOT MERGE
2016-02-02 16:52:59 +00:00
Geoff Mendal
83f0595b6e
Import translations. DO NOT MERGE
...
am: 0873f057db -s ours
* commit '0873f057dbe38f79b499e9988d9db496a32a21f9':
Import translations. DO NOT MERGE
2016-02-02 16:52:01 +00:00
Abodunrinwa Toki
b5c00a2c3d
Merge "Change the character limit for "Keyboard and input methods" string."
2016-02-02 16:30:01 +00:00
Geoff Mendal
49a9587ade
Import translations. DO NOT MERGE
...
Change-Id: I5571d71b847f91111ebc937a387fc97a26546791
Auto-generated-cl: translation import
2016-02-02 08:28:24 -08:00
Abodunrinwa Toki
a295c75232
Change the character limit for "Keyboard and input methods" string.
...
Bug: 26856894
Change-Id: Ic8c6daea79d7f4e19246a6cf00610e5caf138389
2016-02-02 16:26:31 +00:00
Geoff Mendal
0873f057db
Import translations. DO NOT MERGE
...
Change-Id: I747f56476fb70029b7555708f2d9290bd7830021
Auto-generated-cl: translation import
2016-02-02 17:18:55 +01:00
Benjamin Franz
0e111e6922
Revert "Revert "Read default confirm credentials title from policy""
...
This reverts commit ff3d76dfd4 .
Change-Id: Ibdfdc880629ace541744c2ba1f46393e70ae53f5
2016-02-02 15:10:27 +00:00
Robin Lee
cac0dddd2a
Disable VPN prefs for restriction or lockdown case
...
Change-Id: I2fcf84876bf23b92cdcd00ce93514106914d0c29
2016-02-02 14:50:57 +00:00
Philip P. Moltmann
815665a14d
Merge "Use same printer-list template as in the print spooler."
2016-02-01 23:42:07 +00:00