PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,887 Commits 1 Branch 0 Tags
2047d565283a1d1510f5bee29e9d2155a4cfb5ce
Commit Graph

24887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
2047d56528 Import translations. DO NOT MERGE 
Change-Id: Iac589baa34417f61e2b483886f14d51ea81c90e3
Auto-generated-cl: translation import
 2016-01-27 06:35:44 -08: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
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
Sudheer Shanka
a78572cf39 Merge "Update the text shown when admin disabled fingerprint as unlock option." 2016-01-26 22:36:06 +00: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
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
Philip P. Moltmann
1147faa461 Merge "Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly." 2016-01-26 18:25:54 +00:00
Shishir Agrawal
3cc18408c6 DO NOT MERGE : Unhiding MSIM APIs. 
am: 2e1370e9a5  -s ours

* commit '2e1370e9a5575ee92891f7e9fac25cf597e0354d':
  DO NOT MERGE : Unhiding MSIM APIs.
 2016-01-26 18:03:51 +00:00
Shishir Agrawal
2e1370e9a5 DO NOT MERGE : 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 09:32:39 -08:00
Clara Bayarri
0ed7d8cb3e Merge "Profile Challenge Fingerprint Support" 2016-01-26 15:51:27 +00:00
Clara Bayarri
d3ca4fb300 Show unification option only when it will result in a compliant lock 
Change-Id: I05ce21e8949c81313bc686273a9cec93bf5f2a9f
 2016-01-26 15:45:42 +00:00
Clara Bayarri
40db4bbbb5 Profile Challenge Fingerprint Support 
Change-Id: Ic83c479f645776dd0678721bfb732b399f09c992
 2016-01-26 15:45:37 +00:00
Jason Monk
b2e357c788 Remove info icon from app header 
Instead make the app header clickable, launch if coming from app list
and finish if coming from app info.

Bug: 26288458
Change-Id: I7f10a2385356107812dedc8de5d5761b1200e320
 2016-01-26 14:46:43 +00:00
Jason Monk
7eda1c5fa1 Merge "Only show settings drawer on top level items" 2016-01-26 14:46:05 +00:00
Jason Monk
7cd90e012c Merge "Move Home settings to Default apps" 2016-01-26 14:45:25 +00:00
Jason Monk
7ea14c5625 Move Home settings to Default apps 
Change-Id: I2ac7f9dd2c1c505ff3163b2a90c574a360b9409c
 2016-01-26 09:44:39 -05:00
Sudheer Shanka
4e88857db7 Merge "Add padlock to location for work profile when disabled by admin." 2016-01-26 14:42:30 +00:00
Sudheer Shanka
052916efcb Merge "Add preference summary when disabled by admin." 2016-01-26 14:42:05 +00:00
Sudheer Shanka
0d9ac3469b Add padlock to location for work profile when disabled by admin. 
Change-Id: Iee930c9340436cc68ee432ad15ec182ccc6fb0a1
 2016-01-26 14:29:04 +00:00
Vladislav Kuzkokov
1b4e746a7f Merge "Add "Manage backup data" item to "Backup & Reset" settings." 2016-01-26 11:05:05 +00:00
Bartosz Fabianowski
d40c11a7d5 Merge "Allow user to specify whether a new network is shared or private" 2016-01-26 09:38:42 +00:00
Benjamin Franz
f733e93a94 Merge "Add SmallTest annotation to UserCredentialsTest" 2016-01-26 09:30:49 +00:00
Jeremy Klein
1cf002d070 Add a TetherProvisioningActivity for ui-based provisioning. 
This activity acts as a proxy between Tethering.java and the oem
provisioning app on the device. It starts the provisioning app and
relays the response back to a ResultReceiver callback.

BUG:26247383
Change-Id: I35fa6cf45f8ebacceac3e3500b89c798a650caf0
 2016-01-25 20:02:48 -08:00
Jeremy Klein
f7f171d957 Merge "Allow TetherService to take a callback to receiver provision results." 2016-01-26 03:59:53 +00:00
Jeremy Klein
8a934767dc Allow TetherService to take a callback to receiver provision results. 
See ag/850685 for corresponding framework changes. This is being done
as part of exposing a cleaner tethering API which will be used by
Quick Settings and Settings.

BUG: 26247383
Change-Id: I061b8b8b2b0c5bbe98f50deb051e2bfb8e773d61
 2016-01-25 15:09:48 -08:00