Commit Graph

9890 Commits

Author SHA1 Message Date
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
6c7f7e2688 Merge "Use public APIs to update DND policies." 2015-09-28 19:20:54 +00:00
Julia Reynolds
f02aa0cef4 Use public APIs to update DND policies.
Bug: 22977552
Change-Id: I42d3da4052b9212505920b30bb2e24c3e56bc603
2015-09-28 14:51:22 -04:00
Fyodor Kupolov
1f432586b3 Moved restricted profile setup logic to UserManagerService
Bug: 24212155
Change-Id: Iea214877dd856e830a42467780b7407b8991c52d
2015-09-28 10:03:35 -07:00
Bart Sears
3ecabc5411 Merge "Revert "Moved restricted profile setup logic to UserManagerService"" 2015-09-26 02:02:14 +00:00
Bart Sears
fbd126e423 Revert "Moved restricted profile setup logic to UserManagerService"
This reverts commit 151dffcd64.

Change-Id: If98fddcfc8f46c77e3491f7a9fc918ed3752a0e8
2015-09-26 02:00:46 +00:00
Fyodor Kupolov
d905197f56 Merge "Moved restricted profile setup logic to UserManagerService" 2015-09-25 22:48:04 +00:00
Maurice Lam
694a76ac69 am 0764cbf4: am 177db306: am 2fd785e0: am 655ddae8: [Fingerprint] Fix link accessibility
* commit '0764cbf4025d1e756347f4c46abe94faff10977c':
  [Fingerprint] Fix link accessibility
2015-09-25 19:00:02 +00:00
Maurice Lam
0764cbf402 am 177db306: am 2fd785e0: am 655ddae8: [Fingerprint] Fix link accessibility
* commit '177db306c5b623409abac10b58914a0350f50b87':
  [Fingerprint] Fix link accessibility
2015-09-25 18:07:45 +00:00
Maurice Lam
2fd785e099 am 655ddae8: [Fingerprint] Fix link accessibility
* commit '655ddae8b52191633f0052617feb511b0bc02945':
  [Fingerprint] Fix link accessibility
2015-09-25 01:01:57 +00:00
Maurice Lam
655ddae8b5 [Fingerprint] Fix link accessibility
Copied ExploreByTouchHelper, LinkAccessibilityHelper and LinkTextView
from setup wizard and switched fingerprint_settings_footer to use
LinkTextView, so that users can navigate to the link in TalkBack
mode.

Bug: 24343933
Change-Id: I0ff0c054510dfef4263ea223cb0044a4bddf321f
2015-09-24 16:28:27 -07:00
Xiaohui Chen
78873951d4 Merge "A tiny refactor in settings" 2015-09-24 21:24:36 +00:00
Fyodor Kupolov
151dffcd64 Moved restricted profile setup logic to UserManagerService
Bug: 24212155
Change-Id: Ifd19cf5833fb8f2d61cfd6d0019849aa27701c38
2015-09-24 12:59:34 -07:00
Jason Monk
7eda07bc5f resolved conflicts for e0d175ed to master
Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b
2015-09-23 18:55:44 -04:00
Lifu Tang
4148f17616 Explicitly ask for option menu in Fragments
If a Fragment needs option menu, it has to ask for it explicitly by calling
setHasOptionsMenu(true). If a preference screen contains help URL, this
method is called automatically in the base class. However, if a preference
screen doesn't have help URL, this method will not be called. So any other
extra option menu will not be added correctly.

Typically we won't be able to see this bug. Because on standard Nexus builds,
all settings screen have their own help URL. But on AOSP build, as help URL
is empty by default, if the vendor doesn't modify the resource to provide
their own help URL, we'll end up missing some of the option menus.

Bug: 24241310
Change-Id: Iaabc91a1d102e21254b518ec23459025efbdcc84
2015-09-23 14:16:13 -07:00
Jason Monk
e0d175edc6 am 9f773870: am 3b06fd8b: am 16a8e8d1: Make picture color mode less of a feature
* commit '9f773870361cb11729c6997e943a4e540324ea02':
  Make picture color mode less of a feature
2015-09-23 21:00:23 +00: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
Jim Miller
fa7f9b47f4 am e214210c: am a564c950: am 71cfa2f7: am c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit 'e214210c3f0354bf14bb7156314b417e9af7310e':
  Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:31:18 +00:00
Jim Miller
e214210c3f am a564c950: am 71cfa2f7: am c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit 'a564c950673a1d919b192f5bf3bc56e7b2f30d39':
  Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:23:58 +00:00
Jim Miller
71cfa2f794 am c5fa6e26: Add a dummy string to help to add "fingerprint" to search
* commit 'c5fa6e26dffd43d8fab12117d7994d8ab6466048':
  Add a dummy string to help to add "fingerprint" to search
2015-09-23 02:04:51 +00:00
Jim Miller
c5fa6e26df Add a dummy string to help to add "fingerprint" to search
Fixes bug 24172006

Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
2015-09-22 18:30:13 -07:00
Xiaohui Chen
538f6de918 A tiny refactor in settings
Change-Id: I5d3fb3f4ef86bb84de54a8992af476bbb58c2ee9
2015-09-21 10:14:56 -07:00
Xiaohui Chen
9965b1438b Cleanup OWNER in Settings
Bug: 19913735
Change-Id: Iada650431328a304f7c1e6acb8cbde76e4210127
2015-09-21 10:14:49 -07: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
Paul Lawrence
ae4a557a3f Revert "Remove don't kill flag from CryptKeeper to stop logspam"
This reverts commit 4f60679b76.

Bug: 24197523
Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
(cherry picked from commit b33741fce7)
2015-09-19 17:31:08 +00:00
Paul Lawrence
e3d813eef8 am d1edd531: am 57ca15e4: am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
* commit 'd1edd5318b46de5f4d28dca1954886660e05b972':
  Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:56:58 +00:00
Paul Lawrence
57ca15e45e am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
* commit '0f1e7bfe19f2ca7598399712adaedf5acefcfb0b':
  Revert "Remove don't kill flag from CryptKeeper to stop logspam"
2015-09-19 02:41:22 +00:00
Paul Lawrence
0f1e7bfe19 Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev 2015-09-19 02:32:23 +00:00
Paul Lawrence
b33741fce7 Revert "Remove don't kill flag from CryptKeeper to stop logspam"
This reverts commit 4f60679b76.

Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
2015-09-19 02:29:37 +00:00
Jim Miller
93fd2b5c30 am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
* commit '2b6208599d5cd606cc3a685f6ae3d5b9acf5553b':
  Add summary for 0 fingerprint settings preference
2015-09-19 01:22:40 +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
fa9d8258d4 am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
  Add color transform setting
2015-09-19 00:46:06 +00:00
Adam Lesinski
c62f8ea234 am 0896a2e5: am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
* commit '0896a2e545f88785c2a07a4de91d4f5ea67c1a57':
  Update implementation to match BatteryStats.Uid
2015-09-19 00:46:05 +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
Justin Harrison
c6a96d4076 Merge "Add color transform setting" into mnc-dr-dev 2015-09-19 00:21:45 +00:00
Adam Lesinski
1f78f774ca Update implementation to match BatteryStats.Uid
(cherry picked from commit 2350b8445c)

Change-Id: I4289fbb912f3109d0be6a9ab4254bea4c2866d3d
2015-09-18 17:12:30 -07: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
Adam Lesinski
65477c800f am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
  Update implementation to match BatteryStats.Uid
2015-09-18 20:32:04 +00:00
Adam Lesinski
031bbef57e Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev 2015-09-18 20:26:06 +00:00
Paul Lawrence
9db2961ad0 am 1ec8f89b: am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583':
  Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:58:04 +00:00
Paul Lawrence
1ec8f89b8e am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '98e9c7472ccb8f45220f73bf1c693f681681c00a':
  Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:49:49 +00:00
Paul Lawrence
8d28491a2f am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit 'c2e73bbc06739cdd55f7baaca8ab1aa915ee6e83':
  Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:37:01 +00:00
Paul Lawrence
c2e73bbc06 Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev 2015-09-18 14:31:11 +00: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