Commit Graph

6033 Commits

Author SHA1 Message Date
Zach Kuznia
a8f3f067b6 am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev
* commit 'ae8aea76e5cbef1eefde401f8622d05275156cf7':
  Allow manual to be read from disk
2015-10-01 00:15:52 +00:00
Zach Kuznia
ae8aea76e5 Merge "Allow manual to be read from disk" into mnc-dr-dev 2015-10-01 00:08:05 +00:00
Maurice Lam
e618babe5a Merge "Remove outdated setup wizard widgets" 2015-09-30 20:41:15 +00:00
Julia Reynolds
f7748e4ae1 Update zen rule type selection and view.
Separate rule type selection from naming, launch 3P UI for non-system rules.

Bug: 22977552
Change-Id: Ifbd82da2192c4aaf5f239a188a016d9e1af542d6
2015-09-30 16:00:19 -04:00
Maurice Lam
1556f3c371 Merge "[Settings] Remove dependency from SUW nav bar" 2015-09-29 17:02:43 +00:00
Maurice Lam
63b63e4950 Remove outdated setup wizard widgets
Illustration and StickyHeaderListView are now provided as part of
setup wizard library. Cleaning up the old implementations.

Change-Id: I3a7738cb2c918122fd7e8e484b5bbb648fddd931
2015-09-28 17:13:56 -07:00
Maurice Lam
820ee63716 [Settings] Remove dependency from SUW nav bar
Remove setup wizard navigation bar as one of setting's dependencies,
since all the users are using setup wizard library, which includes
the navigation bar as one of its components.

Change-Id: I4ce2b8639155b813a782115725c88d5b1c5c8bfc
2015-09-28 14:57:20 -07:00
Julia Reynolds
f02aa0cef4 Use public APIs to update DND policies.
Bug: 22977552
Change-Id: I42d3da4052b9212505920b30bb2e24c3e56bc603
2015-09-28 14:51:22 -04:00
Jason Monk
7eda07bc5f resolved conflicts for e0d175ed to master
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
2015-09-23 18:55:44 -04:00
Jason Monk
3b06fd8b9d am 16a8e8d1: Make picture color mode less of a feature
* commit '16a8e8d1028c09abe8b083acf9da70e6d65ebb79':
  Make picture color mode less of a feature
2015-09-23 20:44:16 +00:00
Jason Monk
16a8e8d102 Make picture color mode less of a feature
- Shun it to developer settings
 - Hide 'natural' mode
 - Remove dialog

Bug: 24038268
Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
2015-09-23 16:08:13 -04:00
Julia Reynolds
cf92ef10a5 Updates to automatic rule listing page for 3P rules.
Show the provider app icon and name; allow deletion from
listing page; remove the rule summary for consistency.

Bug: 22977552
Change-Id: Ib71832fa4ff64b7321ade39f9964ac52cee6c643
2015-09-21 11:30:02 -04:00
Jim Miller
e2fb8f1d81 am 93fd2b5c: am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
* commit '93fd2b5c3010b17be5391a1e0ae755e31ec9852c':
  Add summary for 0 fingerprint settings preference
2015-09-19 18:15:05 +00:00
Justin Harrison
c591cdd69b am fa9d8258: am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
  Add color transform setting
2015-09-19 18:14:36 +00:00
Jim Miller
50ee327fb9 am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
* commit 'd251fed3ef24b02697a375bf32f382338f500f53':
  Add summary for 0 fingerprint settings preference
2015-09-19 01:08:31 +00:00
Jim Miller
d251fed3ef Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 2015-09-19 00:59:51 +00:00
Justin Harrison
a3add1d208 am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
  Add color transform setting
2015-09-19 00:29:31 +00:00
Jason Monk
0217281d33 Add color transform setting
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Jim Miller
d433359684 Add summary for 0 fingerprint settings preference
This allows the fingerprint summary to be shown when there
are no fingerprints.

Fixes bug 24172006

Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
2015-09-18 15:37:48 -07:00
Maurice Lam
771fac591f [WifiSettings] Add Wi-Fi dialog activity
Add a Wi-Fi dialog activity that can be started by setup wizard to
connect to a Wi-Fi access point.

Also refactored mEdit and mModify in WifiConfigController into an
int-enum mMode, with modes view, connect and modify. This is how the
new modes maps to the old flags:

MODE_VIEW     --  mEdit = false, mModify = *
MODE_CONNECT  --  mEdit = true, mModify = false
MODE_MODIFY   --  mEdit = true, mModify = true

Bug: 23426311
Change-Id: I8e2221fd3c42577068e07686dab245dd5888e0ae
2015-09-17 16:03:49 -07:00
Maurice Lam
6d07779c07 Merge "[ScreenLockSetup] Create separate title string" 2015-09-10 20:57:13 +00:00
Maurice Lam
7d8ebeea94 [ScreenLockSetup] Create separate title string
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.

Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
2015-09-10 12:05:14 -07:00
Jorim Jaggi
cb9d7a96bb resolved conflicts for 99bbec73 to master
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
2015-09-09 18:48:27 -07:00
Jorim Jaggi
ef5f9e3952 am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
* commit '48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
  Add double-tap power button to open camera 2/2
2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3 Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jim Miller
a04ebb412c am eddb0493: am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reache
* commit 'eddb04934b2b52ab0ff6545515df8f0801f538c0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:22:50 +00:00
Jim Miller
01f44efab0 am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:02:34 +00:00
Jorim Jaggi
cc1e9f7ce7 Add double-tap power button to open camera 2/2
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
2015-09-09 22:40:00 +00:00
Jim Miller
457904634c Handle fp enrollment errors more gracefully
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.

Fixes bug 23546104
Fixes bug 22708384

Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
2015-09-09 15:30:40 -07:00
Alan Viverette
a49cce4f38 Rename night mode back to Night mode
Which is technically correct (the best correct) and appropriately
manages user expectations.

Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
2015-09-09 10:27:52 -04:00
Julia Reynolds
ec037c387d Merge "Differentiate battery optimization string." 2015-09-08 17:14:02 +00:00
Julia Reynolds
f08185b8e3 Differentiate battery optimization string.
Bug: 23585186
Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085
2015-09-08 12:49:32 -04:00
Robin Lee
b5e37f1d45 Merge "Show installed user keys in Security Settings" 2015-09-08 16:03:26 +00:00
Maurice Lam
8d6975eb25 Merge "Update setup wizard skip dialog strings" 2015-09-04 19:30:26 +00:00
Maurice Lam
21d27b125f Update setup wizard skip dialog strings
Change "Don't skip" to "Go back".

Bug: 23764890
Change-Id: I899ce893ddeb1cef94d1733871005fd0356ed475
2015-09-04 00:36:43 +00:00
Xiaohui Chen
40aca2ceb4 Remove dead Nsd checkbox
It seems to be dead from few years ago. This cl just cleans things up.
See b/6449478 for context.

Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
2015-09-03 11:29:45 -07:00
Maurice Lam
321b27b67c am 570852da: am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '570852da1875ad34d6d1b751e2bacaee8d7a9a1a':
  [Fingerprint] Update strings for skip dialog
2015-09-03 17:28:44 +00:00
Sungmin Choi
56042b8c36 am eeb5f8f1: am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit 'eeb5f8f1a2d31a9231ebb96ce55abe2213900377':
  To hide none security option, use config_hide_none_security_option config
2015-09-03 17:28:43 +00:00
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
2015-09-02 14:36:19 -07:00
Sungmin Choi
e31208ae1c am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
  To hide none security option, use config_hide_none_security_option config
2015-09-02 21:02:58 +00:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.

Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
2015-09-02 13:51:44 -07:00
Maurice Lam
566af8ce2a am 2fef0595: am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '2fef059543bc859d5723246a635d0e1773f623de':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:48:17 +00:00
Maurice Lam
8cea65f99f am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:24:52 +00:00
Maurice Lam
48cf33a94e [Fingerprint] Add skip dialog during SUW
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.

Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Robin Lee
baefdcf9eb Show installed user keys in Security Settings
This makes removing a particular keyset possible without deleting the
whole keystore along with it.

Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
2015-08-26 16:22:19 +01:00
Wei Liu
9dde0669f2 am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:45:34 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
2015-08-25 11:02:59 -07:00
Selim Cinek
494bcecba5 am c118c90c: am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits
* commit 'c118c90c9bda1bdea7f84469988670fab7b48c61':
  Adapted string length translation limits
2015-08-20 19:59:55 +00:00