PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,070 Commits 1 Branch 0 Tags
eb3b52d41147b87dcb46ff04de5486bb96241bdc
Commit Graph

25070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
27fd447a4d Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: df9f6fc49d  -s ours

* commit 'df9f6fc49d769835179343a2217cb9fc750d4942':
  Import translations. DO NOT MERGE
 2016-01-25 15:36:19 +00:00
Geoff Mendal
9131ab116a Import translations. DO NOT MERGE am: 13391af4fc -s ours am: 6142ec45b9 -s ours 
am: 4b93474e68  -s ours

* commit '4b93474e68b8e3a776ee29d70d035941b1ebe6bd':
  Import translations. DO NOT MERGE
 2016-01-25 15:34:28 +00:00
Geoff Mendal
df9f6fc49d Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-01-25 15:34:18 +00:00
Geoff Mendal
03daf69ed0 Import translations. DO NOT MERGE 
Change-Id: Iee1094b5b742ed2523dd83c8a362f3b889e035f6
Auto-generated-cl: translation import
 2016-01-25 07:32:50 -08:00
Geoff Mendal
4b93474e68 Import translations. DO NOT MERGE am: 13391af4fc -s ours 
am: 6142ec45b9  -s ours

* commit '6142ec45b92457e4119af1408a68bc92117935e8':
  Import translations. DO NOT MERGE
 2016-01-25 15:32:29 +00:00
Geoff Mendal
6142ec45b9 Import translations. DO NOT MERGE 
am: 13391af4fc  -s ours

* commit '13391af4fc4d095d2c94b388e441e34645ef7f68':
  Import translations. DO NOT MERGE
 2016-01-25 15:30:39 +00:00
Geoff Mendal
13391af4fc Import translations. DO NOT MERGE 
Change-Id: I24a034300aade7c9b389c92a29433347cac07070
Auto-generated-cl: translation import
 2016-01-25 07:24:17 -08:00
Sudheer Shanka
5590e2eb44 Update the text shown when admin disabled fingerprint as unlock option. 
When the admin has disabled fingerprint as unlock option, we let the
user know that the admin has disabled that option with a more details
link which will trigger the admin support dialog. And made some small
fixes apart from this.

Change-Id: I01021b952dc6fb29a65d37401a6411a6088d5cef
 2016-01-25 15:12:07 +00:00
Geoff Mendal
764d0d272c Merge "Revert "Import translations. DO NOT MERGE"" 2016-01-25 14:54:16 +00:00
Geoff Mendal
589f0dd32c Revert "Import translations. DO NOT MERGE" 
This reverts commit 098199b614.

Change-Id: Ie756851719c5324ef866be4a56f8d97180610e44
 2016-01-25 14:53:23 +00:00
Geoff Mendal
c7c79f8398 Merge "Import translations. DO NOT MERGE" 2016-01-25 14:36:37 +00:00
Geoff Mendal
098199b614 Import translations. DO NOT MERGE 
Change-Id: I89b37a2718f15f037dfa28fb00e983568b1b1104
Auto-generated-cl: translation import
 2016-01-25 06:34:44 -08:00
Benjamin Franz
12f5e7b13e Move UserCredentialsTests to unit/ 
Change-Id: I17bf5fe982016ffc296ade198a74149dc0bd2ddf
 2016-01-25 14:11:26 +00:00
Sudheer Shanka
95a71e06eb Add disabled by policy message as empty views in preferencefragment. 
Change-Id: I296dc02c8e5cbea74f8415f4c8c5723f85e20b5b
 2016-01-25 14:05:46 +00:00
Clara Bayarri
3d71918c58 Merge "Unify profile and device lock by setting the work lock on the device" 2016-01-25 13:49:34 +00:00
Clara Bayarri
52db3d98c1 Unify profile and device lock by setting the work lock on the device 
Bug: 26577742
Change-Id: I83cae9749d27637745c13f25ac19669b03a3c4bc
 2016-01-25 13:43:21 +00:00
Clara Bayarri
14ff9a91fa Merge "Fix Confirm/Choose Credentials strings related to profile" 2016-01-25 13:33:06 +00:00
Clara Bayarri
34ec5f97fe Fix Confirm/Choose Credentials strings related to profile 
The messages in ConfirmDeviceCredentials have been updated to
inform the user that the pattern/pin/password to be entered is
the profile one.

The strings in the confirmation dialog when the user removes
the lock have also been updated.

Ideally we would have a parametrized approach to strings here,
but capitalization makes it a hard problem.

Bug: 26706338, 26709116
Change-Id: I9f5508d6f449f9e572d65e5b2dcb15cca23832b3
 2016-01-25 13:20:55 +00:00
Robin Lee
7b8f2354f4 Merge "Test: parcel marshalling for user credentials page" 2016-01-25 12:42:30 +00:00
Robin Lee
e26804208c Test: parcel marshalling for user credentials page 
Unit test to verify that the internal Credential that gets passed to
dialogs for removing said credential is actually a valid Parcelable
object, since it's hard to provoke a marshal/unmarshal in real-world
usage (but not impossible).

Bug: 22541933
Change-Id: I780ca2d7b01fc6081b9ea8b2810cfc97f0433a86
 2016-01-25 12:27:31 +00:00
Benjamin Franz
090e37b5f2 Merge "Change build targets for settings tests" 2016-01-25 10:58:50 +00:00
Abodunrinwa Toki
a16852480f Merge "Change Input Settings UI flow." 2016-01-23 15:36:49 +00:00
Steve Pfetsch
f002f23f91 resolve merge conflicts of 259b6a8029 to master. 
Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97
 2016-01-22 17:43:33 -08:00
Steve Pfetsch
259b6a8029 Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev am: 76b29667df 
am: 5ff50f2072

* commit '5ff50f2072880c76b6ad8486b5c35be9a39f9a29':
  Added toast message to color temperature setting
 2016-01-22 22:29:47 +00:00
Steve Pfetsch
5ff50f2072 Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev 
am: 76b29667df

* commit '76b29667dff7b27151e450a05838913971f93c8f':
  Added toast message to color temperature setting
 2016-01-22 22:21:34 +00:00
Steve Pfetsch
76b29667df Merge "Added toast message to color temperature setting" into mnc-dr1.5-dev 2016-01-22 22:07:54 +00:00
Oleksandr Peletskyi
239e8a895f Merge "Added check of the restriction if a user is allowed to change their icon. BUG: 25305966" 2016-01-22 20:31:41 +00:00
Jason Monk
478c592bf3 Only show settings drawer on top level items 
Bug: 26080590
Change-Id: Id5047ef89832eb455719cd57b0e853a97d538a69
 2016-01-22 15:20:20 -05:00
Abodunrinwa Toki
976bb3f459 Change Input Settings UI flow. 
1. Introduces new UI components as per the new flow
2. Temporarily disables components in the old flow that are to be
   replaced by the new flow. This is done so we can neatly revert
   to the old flow if there are issues with the new flow
3. AvailableVirtualKeyboardActivity now responds to
   android.settings.INPUT_METHOD_SETTINGS intents instead of
   InputMethodAndLanguageSettingsActivity

Bug: 25752812
Change-Id: I728d7ee185827ed328c16cb7abce244557a26518
 2016-01-22 18:24:44 +00:00
Anna Galusza
f9d330448b Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies." 2016-01-22 17:56:19 +00:00
Robin Lee
a6420cdb57 Merge "Convert credential view to DialogFragment" 2016-01-22 17:46:02 +00:00
Robin Lee
04046a1976 Convert credential view to DialogFragment 
Bug: 26352310
Change-Id: Ic6af37c893eec5a83e198b9f23ebd766e88e0109
 2016-01-22 17:36:17 +00:00
Maurice Lam
6e68a1cd36 Merge "Use RestrictedRadioButton in SetupRedactionInterstitial" 2016-01-22 17:17:38 +00:00
Benjamin Franz
cc8d37a4c6 Read work challenge background color from device policy 
Call into DevicePolicyManager to retrieve the background color that
should be used for the work challenge on the user whose credential
screen we're about to show.

Change-Id: I612dd96020ce8932b49b21e6ff6faaddd39f957d
 2016-01-22 12:34:46 +00:00
Benjamin Franz
454ce75a41 Merge "Add background image for work challenge" 2016-01-22 12:27:00 +00:00
Oleksandr Peletskyi
ef1584312b Added check of the restriction if a user is allowed to change their icon. 
BUG: 25305966

Change-Id: I35fda2e4f157463d69a109409c3f8767d54eab4a
 2016-01-22 11:57:44 +01:00
Kenny Root
9ceeeb6c02 resolve merge conflicts of bdc6074276 to master. 
Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359
 2016-01-21 19:30:35 -08:00
Maurice Lam
bb044a8cad Use RestrictedRadioButton in SetupRedactionInterstitial 
Bug: 26704975
Change-Id: I857dc0e57d1aaada06be4945b0e377291864ea89
 2016-01-21 18:09:43 -08:00
Kenny Root
bdc6074276 Merge "Stop using AlgNameMapper" 
am: 8646736618

* commit '86467366183e7b7ca006456474cca50332213ca5':
  Stop using AlgNameMapper
 2016-01-21 22:12:38 +00:00
Kenny Root
8646736618 Merge "Stop using AlgNameMapper" 2016-01-21 21:53:11 +00:00
Jason Monk
e07c947ea3 Fix build. 
Change-Id: I43201fc9bb989d3f490ba26cb93956878745e366
 2016-01-21 14:15:46 -05:00
Sudheer Shanka
1da7221476 Merge "Add padlocks to preferences that can be disabled by policy." 2016-01-21 19:07:02 +00:00
Sudheer Shanka
4cd2b33dec Merge "Add padlock to usb modes when disabled by admin." 2016-01-21 18:46:17 +00:00
Steve Pfetsch
8897655d2e Added toast message to color temperature setting 
Added a toast message to inform the user that the color temperature
setting is applied once the display is off.

Bug:26110238
Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
 2016-01-21 10:44:51 -08:00
Sudheer Shanka
1c3fd76ee0 Add padlock to usb modes when disabled by admin. 
Change-Id: I8504febd78f083eb3ff88926fe29d69edc62b6ef
 2016-01-21 18:41:05 +00:00
Clara Bayarri
450ebb586e Merge "Fix bugs around unification when no password is set" 2016-01-21 17:50:17 +00:00
Philip P. Moltmann
be37bdff48 Settings: Handle non-nullness of PrintJobId.unflattenFromString and printer.getName() correctly. 
Change-Id: If22acfee7c6a7c21803fe79ff04f33181dd10167
 2016-01-21 09:16:25 -08:00
Andres Morales
e32497c6de Track ro.flash.locked bit to enable/disable OEM unlocking pref 
if the device is OEM unlocked already, disable the OEM
unlocking pref. If it's locked, enable.

Bug: 26039090
Change-Id: I915f3cf57deef8f5775d466dec59c891c1546b1b
 2016-01-21 08:30:31 -08:00
Clara Bayarri
7402b25143 Fix bugs around unification when no password is set 
- When in a unified state, selecting the work lock to be "none" caused
a security exception
- When the work lock was set to "none", unifying didn't work
- When in a unified state, the work lock type selection screen showed
"none" as the current type instead of the device lock type

Bug: 26577247
Change-Id: I853d77186e23b6a458eaa6c1047942a7eefddc9c
 2016-01-21 15:27:38 +00:00
Jason Monk
34de9f6bf8 Protect against missing subscriptions 
Bug: 26676464
Change-Id: I428dd60e6774f7ca88423edb7a87e51ee8a7dadd
 2016-01-21 09:43:35 -05:00