Jason Monk
d3ac239e32
Add wifi calling suggestion
...
Change-Id: I737736d675fe0a4606ff1ccfd7d4ec6b69e1fd73
2016-01-27 13:58:49 -05:00
Geoff Mendal
c7947b7e97
Import translations. DO NOT MERGE am: 963c4b3d41
-s ours am: 495ba780b9
-s ours
...
am: a43de57411
-s ours
* commit 'a43de574118046520a71afc4ad14c524611ec4c0':
Import translations. DO NOT MERGE
2016-01-27 16:26:06 +00:00
Geoff Mendal
450b10b3c2
Import translations. DO NOT MERGE am: 9c57679b0e
-s ours
...
am: ec30b691de
-s ours
* commit 'ec30b691de360ebc0030e799dd5f42ed90720ada':
Import translations. DO NOT MERGE
2016-01-27 16:25:57 +00:00
Geoff Mendal
a43de57411
Import translations. DO NOT MERGE am: 963c4b3d41
-s ours
...
am: 495ba780b9
-s ours
* commit '495ba780b98bc1333e613d96721355aa1003913b':
Import translations. DO NOT MERGE
2016-01-27 16:24:10 +00:00
Geoff Mendal
ec30b691de
Import translations. DO NOT MERGE
...
am: 9c57679b0e
-s ours
* commit '9c57679b0e06d9976bb4c72d442b3412d9220c43':
Import translations. DO NOT MERGE
2016-01-27 16:24:00 +00:00
Geoff Mendal
495ba780b9
Import translations. DO NOT MERGE
...
am: 963c4b3d41
-s ours
* commit '963c4b3d41c872404e84d469b213cd5a84d6d3ec':
Import translations. DO NOT MERGE
2016-01-27 16:22:12 +00:00
Chris Wren
9d1bfd1e8d
port settings over to new metrics enum
...
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
2016-01-27 10:58:58 -05:00
Geoff Mendal
9c57679b0e
Import translations. DO NOT MERGE
...
Change-Id: I528d633660acacb4ed8a3f1d6bf2b35b3ce3170d
Auto-generated-cl: translation import
2016-01-27 07:34:25 -08:00
Geoff Mendal
963c4b3d41
Import translations. DO NOT MERGE
...
Change-Id: I11b283943bfe2746792e6a9ec3c3ca5f3f000832
Auto-generated-cl: translation import
2016-01-27 07:25:34 -08:00
Sudheer Shanka
6a83d7537d
Merge "Made changes to menu items in WifiSettings and AccountSyncSettings."
2016-01-27 15:15:29 +00:00
Sudheer Shanka
ce71ae91e5
Merge "Add padlocks to more preferences in wireless settings."
2016-01-27 15:15:06 +00:00
Abodunrinwa Toki
e55afb181b
Merge "Settings app: Remove "Toggle keyboard shortcuts helper" button"
2016-01-27 15:12:02 +00:00
Geoff Mendal
9f044351ba
Merge "Import translations. DO NOT MERGE"
2016-01-27 14:44:12 +00:00
Geoff Mendal
2047d56528
Import translations. DO NOT MERGE
...
Change-Id: Iac589baa34417f61e2b483886f14d51ea81c90e3
Auto-generated-cl: translation import
2016-01-27 06:35:44 -08:00
Jason Monk
eede8d563e
Merge changes I81380323,I0cce76f3
...
* changes:
Add wallpaper suggestion if one isn't set.
Add DND Suggestion after 30 days
2016-01-27 14:19:42 +00:00
Sudheer Shanka
7ff7ea1e7f
Made changes to menu items in WifiSettings and AccountSyncSettings.
...
When the admin has set disallow_config_wifi, menu items are not added.
we need to check if the menu items can be added after this fragment is
resumed. And for remove account menuitem, check whether any admin has
disabled management of a specific account type.
Change-Id: I58f5a59fe0614c9bc7068b15f43f89527939359d
2016-01-27 14:08:44 +00:00
Clara Bayarri
c83d21c7d3
Merge "Fix Profile Fingerprint Settings to use correct user id"
2016-01-27 12:50:09 +00:00
Clara Bayarri
4f5f7b4f9a
Fix Profile Fingerprint Settings to use correct user id
...
Bug: 26790762
Change-Id: Id813c03041e6e727f535ec63f63ee8b187b06164
2016-01-27 12:46:17 +00:00
Abodunrinwa Toki
635725d458
Merge "Fix comment."
2016-01-27 11:52:24 +00:00
Abodunrinwa Toki
7adce5463a
Fix comment.
...
Change-Id: Ie4a535d2bf46a1ac3380ca8dbcf0b6665760ecb2
2016-01-27 11:51:27 +00:00
Clara Bayarri
40c0bf3ffc
Merge "Show unification option only when it will result in a compliant lock"
2016-01-27 10:59:09 +00:00
Rubin Xu
a8d2fb4a6a
Merge "resolve merge conflicts of 55d7fcbfc2
to master."
2016-01-27 00:35:52 +00:00
Rubin Xu
b557817abc
resolve merge conflicts of 55d7fcbfc2
to master.
...
Change-Id: Ib0876ea153e8a8f7c8ad5438915d39c9ae97e51b
2016-01-27 00:34:53 +00:00
Shishir Agrawal
91d921904f
Merge "Unhiding MSIM APIs."
2016-01-27 00:32:29 +00:00
Rubin Xu
55d7fcbfc2
Merge "Support multiple CA certs when editing a saved Wifi network." into mm-wireless-dev
2016-01-27 00:26:59 +00:00
Rubin Xu
e34ea11fca
Support multiple CA certs when editing a saved Wifi network.
...
SSID with multiple CA certs can only be added programmtically. However it
can still be edited in the UI by long-pressing the item when currently
connected to the network. This change makes sure the UI shows up with
meaningful indications that the SSID is configured with multiple CA certs.
Bug: 22547958
Change-Id: I5d42313efb141db521dd09ff3fbc520915b6fb79
2016-01-27 00:25:10 +00:00
Sudheer Shanka
8b8683068f
Add padlocks to more preferences in wireless settings.
...
Also set the userRestriction attribute in xml instead of
checking in WirelessSettings class and set useAdminDisabledSummary
attribute.
Change-Id: I0494bd18752425f9d4f3f7d0f64f21fcba0d26da
2016-01-27 00:25:03 +00:00
Udam Saini
06dc55d6ce
Merge "Removes fingerprint onboard screen"
2016-01-27 00:18:41 +00:00
Udam Saini
cce5339da7
Removes fingerprint onboard screen
...
This screen isn't used anymore. This also fixes some fingerprint
work in setup wizard to use the userId instead.
Change-Id: Icb1debaf7b2766069a53a75eab6152d6b816b03c
2016-01-26 15:48:37 -08:00
Udam Saini
f7853577b1
Merge "Fixes a bug where user couldnt add a new fingerprint"
2016-01-26 23:29:16 +00:00
Udam Saini
72506b61ab
Fixes a bug where user couldnt add a new fingerprint
...
Short term fix as there seems to be more user related that
need to be fixed in here (renaming/deleting fingerprint)
in the fingerprint manager
bug:26799512
Change-Id: I5a5d63b0682095a31eeb4cdf07322a3129b0f343
2016-01-26 15:08:20 -08:00
Jason Monk
b9e5d238b6
Add wallpaper suggestion if one isn't set.
...
Change-Id: I81380323f0d4f5af842a81028a763219958833bc
2016-01-26 17:48:29 -05:00
Sudheer Shanka
a78572cf39
Merge "Update the text shown when admin disabled fingerprint as unlock option."
2016-01-26 22:36:06 +00:00
Jason Monk
4a60c8876e
Add DND Suggestion after 30 days
...
Suggest users setup automatic rules if they haven't after 30 days
Also fix the id labeling for the RV adapter, so that it can handle
removing of suggestions properly.
Change-Id: I0cce76f3db1d444011f7d8a31348714d102650cf
2016-01-26 17:29:59 -05:00
Sudheer Shanka
49e9f612d1
Merge "Add restricted padlock support for listpreference."
2016-01-26 22:29:43 +00:00
Shishir Agrawal
d2b0fc066c
Unhiding MSIM APIs.
...
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.
Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
2016-01-26 13:48:21 -08:00
Sudheer Shanka
550d068abd
Add restricted padlock support for listpreference.
...
Change-Id: I1f3284a474d225df803abd57dd71382cb1dfa659
2016-01-26 21:40:49 +00:00
Julia Reynolds
679fde4c15
Merge "Show app level settings when app doesn't use topics."
2016-01-26 21:21:05 +00:00
Philip P. Moltmann
3ed1752141
Merge "No need to declare minSdkVersion for Settings app."
2016-01-26 21:17:51 +00:00
Philip P. Moltmann
02b7cfec17
No need to declare minSdkVersion for Settings app.
...
Change-Id: I2b221ed2bb410578e57475dbbe0106826bfc3f76
2016-01-26 13:14:42 -08:00
Abodunrinwa Toki
c8da2e13a5
Settings app: Remove "Toggle keyboard shortcuts helper" button
...
Change-Id: I93bd51a05a8922e02e4e09add94d247442f67334
2016-01-26 21:10:15 +00:00
Abodunrinwa Toki
bfae9dd7f2
Merge "Input settings: Associate keyboard layouts with device/IME subtype."
2016-01-26 21:00:46 +00:00
Abodunrinwa Toki
c043de9fbf
Merge "Settings app: Include package icons in list of virtual keyboards"
2016-01-26 20:59:15 +00:00
Abodunrinwa Toki
5f0b59babf
Input settings: Associate keyboard layouts with device/IME subtype.
...
Implements selection of keyboard layouts using the new InputManager
methods that associate keyboard layouts to
device/InputMethodInfo/InputMethodSubtype
See: Ie88ce1ab77dbfe03ab51d89c1dc9e0a7ddbb3216
Bug: 25752812
Change-Id: Ib76880d66391ca37978054de80f4b3b5147cecc3
2016-01-26 20:57:06 +00:00
Julia Reynolds
92ea89c356
Show app level settings when app doesn't use topics.
...
Change-Id: I3c31a1bdddc70077182ea910911de1444472b7a9
2016-01-26 15:38:28 -05:00
Jason Monk
2e634f872e
Merge "Support changes to SuggestionParser"
2016-01-26 19:52:56 +00:00
Maria Garcia Puyol
4ec12f7703
Merge "Add Emergency Info preference to user settings"
2016-01-26 19:00:51 +00:00
Jason Monk
91ca519a0f
Support changes to SuggestionParser
...
Change-Id: I002e10cfe2a058f934d2c6218c88c2588654733f
2016-01-26 13:58:25 -05:00
mariagpuyol
0401388028
Add Emergency Info preference to user settings
...
Bug: 23591361
Change-Id: I514cfcf79aef091483c5826414b0317b581cb055
2016-01-26 10:58:10 -08:00
Sudheer Shanka
b2ed2d8583
Merge "Add policy disabled msg as empty views in zenmode related fragments."
2016-01-26 18:41:19 +00:00