PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,625 Commits 1 Branch 0 Tags
a6820166fa7ccdda2e27c33c745eedf7fc44d5b1
Commit Graph

26625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suprabh Shukla
a6820166fa resolve merge conflicts of d83867c to master 
Change-Id: I999d87f33ef028055ea42197b518dbe57e8312cf
 2016-04-08 18:34:54 -07:00
Suprabh Shukla
d83867c551 Merge "Moving HelpUtils to SettingsLib" into nyc-dev 
am: 1d464b9

* commit '1d464b9677c4f956dab81622b2cb59c53cbf01dd':
  Moving HelpUtils to SettingsLib

Change-Id: I2b855b36d0f3af29f5bc35008017aa7539cd0677
 2016-04-09 00:32:15 +00:00
Suprabh Shukla
1d464b9677 Merge "Moving HelpUtils to SettingsLib" into nyc-dev 2016-04-08 19:31:37 +00:00
Jason Monk
e74ae23269 resolve merge conflicts of 65b5952 to master 
Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6
 2016-04-08 13:34:47 -04:00
Jason Monk
65b5952e4c Merge "Restore the premiume SMS Preference." into nyc-dev 
am: b8bce66

* commit 'b8bce66c02bef58d9df3bdfe0fc4a29da9491296':
  Restore the premiume SMS Preference.

Change-Id: Id83745add76b1afba24bf487dab12a66ebe4f0c3
 2016-04-08 17:11:43 +00:00
Jason Monk
b8bce66c02 Merge "Restore the premiume SMS Preference." into nyc-dev 2016-04-08 17:04:43 +00:00
Jason Monk
ea35f87377 Restore the premiume SMS Preference. 
Fixes: 27657256
Change-Id: I396eb9ba71f51fed517d7f958873369bc0ab011e
 2016-04-08 13:02:48 -04:00
Victor Chang
27fedfc2fa TrustedCredentialsSettings should be launched in personal user instead of work user am: 37afa28 
am: 0b4846e

* commit '0b4846e808f736abb5c524cf914e684d5b12627f':
  TrustedCredentialsSettings should be launched in personal user instead of work user

Change-Id: I5f06de99e8f70cb3e2cc4d028c0dd00f9f138818
 2016-04-08 16:02:11 +00:00
Victor Chang
0b4846e808 TrustedCredentialsSettings should be launched in personal user instead of work user 
am: 37afa28

* commit '37afa286f926b527c430c312d509eb8ebe7a2593':
  TrustedCredentialsSettings should be launched in personal user instead of work user

Change-Id: I85809994177a3c605e3b3ca4e9d57c7996016566
 2016-04-08 15:57:44 +00:00
Daniel U
1933b8eef8 Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev am: 9f4ad67 
am: 957ec6a

* commit '957ec6aee4ad8dfbde5cedb9791effdce1ca9825':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I999f240c0112abb9b366017e7def431a2c3dae79
 2016-04-08 15:55:32 +00:00
Abodunrinwa Toki
ada3b3a0d4 Merge "Input settings: Show keyboard layout collection." into nyc-dev am: f103d10 
am: 186d97b

* commit '186d97bbab34d51a88321da2556eda551ea0ddd3':
  Input settings: Show keyboard layout collection.

Change-Id: Ia7e6d50590ac19f9f8e9de333bc36c73d6790c09
 2016-04-08 15:55:32 +00:00
Daniel U
957ec6aee4 Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev 
am: 9f4ad67

* commit '9f4ad67fad34331aecbdabd4a0193038fa0e9f79':
  Allow user to hide sensitive notifications with no work challenge

Change-Id: I80943b49439532bdb676825ac9a8ee5bc7088b11
 2016-04-08 15:51:13 +00:00
Abodunrinwa Toki
186d97bbab Merge "Input settings: Show keyboard layout collection." into nyc-dev 
am: f103d10

* commit 'f103d10861e6a702f8f29d42e48214c94b1ddb91':
  Input settings: Show keyboard layout collection.

Change-Id: I813b902c6638befc9dcd7ebd166e8fe9c33731a5
 2016-04-08 15:51:12 +00:00
Victor Chang
37afa286f9 TrustedCredentialsSettings should be launched in personal user instead of work user 
Bug: 18224038
Change-Id: I861a0b98b4b7f0792332b980c1c8e080864b4d57
 2016-04-08 15:48:04 +00:00
Daniel U
9f4ad67fad Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev 2016-04-08 15:44:44 +00:00
Abodunrinwa Toki
f103d10861 Merge "Input settings: Show keyboard layout collection." into nyc-dev 2016-04-08 15:43:13 +00:00
Abodunrinwa Toki
f6053d1536 Input settings: Show keyboard layout collection. 
E.g. Android keyboard or Nexus Compat keyboard.

Bug: 27250977
Change-Id: Icd256a760b157418f52046f10ca272561b692838
 2016-04-08 14:08:56 +01:00
Robin Lee
7da1bc30b9 Merge "Credential storage: check lock quality for right user" into nyc-dev am: 16b4ac8 
am: c6696f1

* commit 'c6696f1c8675692bb0977a35ab65920f9eef67f1':
  Credential storage: check lock quality for right user

Change-Id: Iea17251ba3d27f2d4a2978d4466e5f80c0effdbe
 2016-04-08 11:02:40 +00:00
Robin Lee
c6696f1c86 Merge "Credential storage: check lock quality for right user" into nyc-dev 
am: 16b4ac8

* commit '16b4ac8a8efb7ea06397ff559984c3c08f275398':
  Credential storage: check lock quality for right user

Change-Id: Iea518cce08617d5ccfa6d5e43d5a65e377631528
 2016-04-08 10:58:34 +00:00
Oleksandr Peletskyi
046501fb85 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev am: 76a2981 
am: 717ed0e

* commit '717ed0eed7bf60ed5163b8139bfdf7fc4f8a3072':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I8d712b436c36041f28e3a1d0871b2a3d83a265f3
 2016-04-08 10:54:27 +00:00
Robin Lee
16b4ac8a8e Merge "Credential storage: check lock quality for right user" into nyc-dev 2016-04-08 10:53:23 +00:00
Oleksandr Peletskyi
717ed0eed7 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev 
am: 76a2981

* commit '76a29810c30978b958f953c3248fbd4ef19b5f79':
  Improved UX when DISALLOW_SET_WALLPAPER is set.

Change-Id: I354816c172deb4624326128079b50d6de4bf9031
 2016-04-08 10:50:23 +00:00
Oleksandr Peletskyi
76a29810c3 Merge "Improved UX when DISALLOW_SET_WALLPAPER is set." into nyc-dev 2016-04-08 10:44:06 +00:00
Oleksandr Peletskyi
c485487ac5 Improved UX when DISALLOW_SET_WALLPAPER is set. 
Changed type of Settings > Display > Wallpeper menu item
to RestrictedPreference. This allows to show the reason,
why the Wallpaper menu item is blocked.

BUG: 27914814
Change-Id: I6eb23ec9fcaa39bb7e45d020a5aaca0d83cef81f
 2016-04-08 11:32:48 +02:00
Ruben Brunk
ec6e52649d Merge "Fix Settings activity typo." into nyc-dev am: 77359ad 
am: 3f32a9f

* commit '3f32a9ff1011134f7fcfb1da9b108074e3a988bc':
  Fix Settings activity typo.

Change-Id: Idef0d055fadbb2f7b1021bdee2b2601f9add66df
 2016-04-08 05:22:47 +00:00
Ruben Brunk
3f32a9ff10 Merge "Fix Settings activity typo." into nyc-dev 
am: 77359ad

* commit '77359ad76117c3ffc7fe40890f8bbdc8736f143c':
  Fix Settings activity typo.

Change-Id: Ie11bb09128fbbedc72252583e0a6a721ef1e17bd
 2016-04-08 05:18:52 +00:00
Ruben Brunk
77359ad761 Merge "Fix Settings activity typo." into nyc-dev 2016-04-08 05:13:18 +00:00
Ruben Brunk
c461d5c03d Fix Settings activity typo. 
Bug=28078304

Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
 2016-04-07 22:08:09 -07:00
Toni Barzic
b70e224060 Teach settings about PASSWORD_QUALITY_MANAGED constant am: e7d6e4d 
am: 513bdfd

* commit '513bdfd0526579d79336341d3bb7150ac53b5f20':
  Teach settings about PASSWORD_QUALITY_MANAGED constant

Change-Id: I2d329042ad356c568907336f82d5043d591f89d6
 2016-04-07 23:24:56 +00:00
Toni Barzic
513bdfd052 Teach settings about PASSWORD_QUALITY_MANAGED constant 
am: e7d6e4d

* commit 'e7d6e4ddb2371dc49015e17e2d6b9dc604fbbf58':
  Teach settings about PASSWORD_QUALITY_MANAGED constant

Change-Id: Iae34431928a38b8bf7de0f59fb0b7bfb306760ff
 2016-04-07 23:21:17 +00:00
Fan Zhang
1d090c798f Merge "Dashboard status cards UI." 2016-04-07 23:10:07 +00:00
Fan Zhang
d42e233bf0 Dashboard status cards UI. 
Bug: 27907841

This adds a card view type to display status in Settings dashboard. Also
added necessary pieces to layout status and condition views properly.

The data for status is not wired up yet.

Change-Id: I8ed624177645f389ec0bb71420f073c6dbc03ccb
 2016-04-07 13:23:37 -07:00
Toni Barzic
e7d6e4ddb2 Teach settings about PASSWORD_QUALITY_MANAGED constant 
Add hooks for adding an option for selecting a managed password as
lock credential. By default this option will not be visible.

BUG=27923581

Change-Id: Id17bd8074bf23cbcffb96d8576cc760df6f2298a
 2016-04-07 10:44:35 -07:00
Ricky Wai
473e0c1891 Fix work profile screen timeout policy am: 36cce83 
am: 0a18f9d

* commit '0a18f9d94ca64bff7871812c1202fd9d1cdedd8d':
  Fix work profile screen timeout policy

Change-Id: Id59e79f852c2d0cd39d948c55e7e1ebd8c90bbef
 2016-04-07 16:34:04 +00:00
Ricky Wai
0a18f9d94c Fix work profile screen timeout policy 
am: 36cce83

* commit '36cce830b9319985b138432b89ea1022acf68785':
  Fix work profile screen timeout policy

Change-Id: If444464cd47efd2ced9c7b3d4f99465ab48360ea
 2016-04-07 16:30:20 +00:00
Ricky Wai
36cce830b9 Fix work profile screen timeout policy 
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
 2016-04-07 17:18:04 +01:00
Ricky Wai
3a9c80a2d2 Delete all work fingerprints when unified lock changes to None/Swipe am: 751de37 
am: d82f072

* commit 'd82f072e0c5ac063d094d65733da4a8117a50cf5':
  Delete all work fingerprints when unified lock changes to None/Swipe

Change-Id: I205a28dbbf5440d128ba6ee74ce95adad61f1806
 2016-04-07 16:02:18 +00:00
Ricky Wai
d82f072e0c Delete all work fingerprints when unified lock changes to None/Swipe 
am: 751de37

* commit '751de372750336c2dbc6ed656de84b881ede0858':
  Delete all work fingerprints when unified lock changes to None/Swipe

Change-Id: I08b79db759838f9e34d5d8072cd035753db87408
 2016-04-07 15:53:08 +00:00
Ricky Wai
858b6b9262 Fingerprint should confirm device lock when unified am: 996d0df 
am: e9da442

* commit 'e9da44277d875ed8c1f5b3b7c411c706c7201c37':
  Fingerprint should confirm device lock when unified

Change-Id: I77738befb17c89442c614f5798aff80049e95464
 2016-04-07 15:42:45 +00:00
Ricky Wai
751de37275 Delete all work fingerprints when unified lock changes to None/Swipe 
Bug: 27551139
Change-Id: I64105621057e04be0e4d8073626ac3ed0f1e72d2
 2016-04-07 15:41:18 +00:00
Ricky Wai
e9da44277d Fingerprint should confirm device lock when unified 
am: 996d0df

* commit '996d0dfa6e42e6249853397fafe4a93e7ffeb3f3':
  Fingerprint should confirm device lock when unified

Change-Id: I9d925666269a01c6b50224a1fe84ed93f632e08e
 2016-04-07 15:39:00 +00:00
Ricky Wai
996d0dfa6e Fingerprint should confirm device lock when unified 
When unified and adding a fingerprint, the user is prompted to set up
a backup

Bug:27419438
Change-Id: I6cfa8c276ae69a0af51580be390c3da4e9596874
 2016-04-07 15:11:14 +00:00
Ricky Wai
93eedb5de3 Keymaster init for work profile am: 4bbf065 
am: 3c6e000

* commit '3c6e0008d605c16491e75c78951f37b77d0badc9':
  Keymaster init for work profile

Change-Id: I8126a98645715199be665aa3e1f6c037d474b694
 2016-04-07 14:44:17 +00:00
Ricky Wai
3c6e0008d6 Keymaster init for work profile 
am: 4bbf065

* commit '4bbf0653c0197aca3baa587df80e76ba1159a4fb':
  Keymaster init for work profile

Change-Id: I4c61e2762128fa11fbe693d3ae40937a3b9fb29d
 2016-04-07 14:38:22 +00:00
Ricky Wai
4bbf0653c0 Keymaster init for work profile 
Changes:
(1) When unified work challenge is enabled and screen lock is secure
  - Store work profile secure key in primary profile
  - When primary user keystore unlocked, unlock work profile keystore
  - When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
  - When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
  - Remove work secure key in primary
(4) When user changes work challenge from separate to unified
  - Do (1) and (2)

Bug: 27460698

Change-Id: Id7464c178e6ea7b561643477e7cd84f963048c87
 2016-04-07 14:23:55 +00:00
Robin Lee
330c2052ec Credential storage: check lock quality for right user 
Checking the wrong user can lead to an infinite loop when trying to
install credentials from a managed profile.

Bug: 28043334
Change-Id: I3e1044069f0d5139a47de461996a6d98e0fe5e2f
 2016-04-07 14:55:06 +01:00
Robin Lee
d49caa77e1 Merge "Guard double-showing of user credentials dialog" into nyc-dev am: 1dea763 
am: 73925bf

* commit '73925bfe5456da274617d8c3fba32d2858ca8959':
  Guard double-showing of user credentials dialog

Change-Id: I21964972bd9434ae71491bf637e7b494cc2ddbae
 2016-04-07 13:43:34 +00:00
Robin Lee
73925bfe54 Merge "Guard double-showing of user credentials dialog" into nyc-dev 
am: 1dea763

* commit '1dea763d05aae89ca87ff0e59513f18ed75e6b35':
  Guard double-showing of user credentials dialog

Change-Id: If2c7e62a2ca37a773af18c6c8e6a86f8e94be9c9
 2016-04-07 13:40:21 +00:00
Robin Lee
1dea763d05 Merge "Guard double-showing of user credentials dialog" into nyc-dev 2016-04-07 13:32:53 +00:00
Robin Lee
f8e2dbf2d2 Guard double-showing of user credentials dialog 
Only create & show the dialogfragment if it does not already exist.

Bug: 28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c
 2016-04-07 13:20:21 +01:00