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

26602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Winston Man
6f250236dc Amend icon size for delete work profile dialog am: 90aec18 
am: bea2dd7

* commit 'bea2dd773d40b2bcb5c317ae060b7cd5094e48b3':
  Amend icon size for delete work profile dialog

Change-Id: I5f17e6cb394039b4b88de3163edd13223809027e
 2016-04-07 09:51:20 +00:00
Winston Man
bea2dd773d Amend icon size for delete work profile dialog 
am: 90aec18

* commit '90aec184b4229afca5cd7ae549b49ae8f93fd1e7':
  Amend icon size for delete work profile dialog

Change-Id: I7ee70923ea575aae530304472acdfd34438bd898
 2016-04-07 09:48:20 +00:00
Winston Man
90aec184b4 Amend icon size for delete work profile dialog 
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml

Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8

Bug:27636781

Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
 2016-04-07 09:42:11 +00:00
Nicolas Prévot
856a7ae8ad Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev am: 74777cc 
am: 195eadc

* commit '195eadc1b080246e7cf87e9a879024246a61fbbf':
  Ask the user to unlock the work profile before adding a work account.

Change-Id: I0c205d6aca59f995bc30eb22464c735890797fdf
 2016-04-07 09:39:22 +00:00
Nicolas Prevot
195eadc1b0 Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev 
am: 74777cc

* commit '74777ccd90e8b94614ae29beb7a7e1dbadae77f0':
  Ask the user to unlock the work profile before adding a work account.

Change-Id: I2c2eb6a1117e95079ac3923368d7715e90457880
 2016-04-07 09:30:19 +00:00
Nicolas Prévot
74777ccd90 Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev 2016-04-07 09:23:19 +00:00
Suprabh Shukla
3a263d1d43 Merge "Fix user photo popup layout for RTL" into nyc-dev am: 90b71c6 
am: 0e90766

* commit '0e90766a5f703ca7f7a9354f4d675cffdeac5238':
  Fix user photo popup layout for RTL

Change-Id: Id94327e224cf78eb26af4afc59f68703459e7477
 2016-04-07 01:05:36 +00:00
Ryoji Miyazaki
0e90766a5f Merge "Fix user photo popup layout for RTL" into nyc-dev 
am: 90b71c6

* commit '90b71c644de6b207fdd420893620214664dc4b44':
  Fix user photo popup layout for RTL

Change-Id: Iebb04501346887829d608b7ad38e78186d03fd10
 2016-04-07 01:02:49 +00:00
Ryoji Miyazaki
298ec9bd44 Merge "Fix user photo popup layout for RTL" am: 6186414 am: d0d0af8 
am: 3c51422

* commit '3c5142206751fd2a8a8d34f07d555e56dc9e6d71':
  Fix user photo popup layout for RTL

Change-Id: Iee89eb2b252c6fdf920fa84eafd538d7178f0a58
 2016-04-07 00:58:00 +00:00
Suprabh Shukla
90b71c644d Merge "Fix user photo popup layout for RTL" into nyc-dev 2016-04-07 00:56:04 +00:00
Amith Yamasani
3c51422067 Merge "Fix user photo popup layout for RTL" am: 6186414 
am: d0d0af8

* commit 'd0d0af817c015f9fee73d445bb7881a9ce9112a2':
  Fix user photo popup layout for RTL

Change-Id: Ibe95cb653b9dcce0489abb6187448464083e224d
 2016-04-07 00:53:05 +00:00
Ryoji Miyazaki
d0d0af817c Merge "Fix user photo popup layout for RTL" 
am: 6186414

* commit '6186414be83ac8b0b92ebe566ca3282dfbc4127a':
  Fix user photo popup layout for RTL

Change-Id: Iebf266aa4948a2d24a55ba3876f2e15d085b7112
 2016-04-07 00:50:21 +00:00
Amith Yamasani
6186414be8 Merge "Fix user photo popup layout for RTL" 2016-04-07 00:44:06 +00:00
Ryoji Miyazaki
9238e50a80 Fix user photo popup layout for RTL 
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/

Bug: 27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
 2016-04-06 17:24:16 -07:00
Andres Morales
139d1999e7 Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev am: 2006403 
am: 11dcefc

* commit '11dcefc9a87f349d1554645f23bad6d065e5ce2a':
  handle devices that don't support FLASH_LOCK_STATE

Change-Id: Ic3e8ab682e2875bbf79c83878d931e305369606f
 2016-04-07 00:14:16 +00:00
Andres Morales
11dcefc9a8 Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev 
am: 2006403

* commit '20064037a7e52584a69edbaeccd29c23630a4156':
  handle devices that don't support FLASH_LOCK_STATE

Change-Id: Ib5857f6a49aa8f2e105900a6ec0bcb2bf4908067
 2016-04-07 00:09:13 +00:00
Andres Morales
20064037a7 Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev 2016-04-07 00:00:38 +00:00
Andres Morales
ce4bdca151 handle devices that don't support FLASH_LOCK_STATE 
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.

Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
 2016-04-06 15:04:48 -07:00
Maurice Lam
87da294262 Merge "Update fingerprint strings during setup" into nyc-dev am: a01e2b9 
am: f312bd6

* commit 'f312bd68dadd6404c3cd86c614b6e08be7d25797':
  Update fingerprint strings during setup

Change-Id: Ieb0f1fd7529754ca0a346cb0cb805fb73d0e2996
 2016-04-06 21:41:44 +00:00
Maurice Lam
f312bd68da Merge "Update fingerprint strings during setup" into nyc-dev 
am: a01e2b9

* commit 'a01e2b96f6c5741e5304e1ae399bbbff32eeaaa4':
  Update fingerprint strings during setup

Change-Id: I1a212f2c1d8e28f6743bfbc38e92f1a9cad723aa
 2016-04-06 21:39:29 +00:00
Maurice Lam
a01e2b96f6 Merge "Update fingerprint strings during setup" into nyc-dev 2016-04-06 21:34:34 +00:00