PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,411 Commits 1 Branch 0 Tags
fd2c7224185bef301cfaa7de6fe1af22cab8df2f
Commit Graph

10206 Commits

Author SHA1 Message Date
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
Zach Jang
386c7763eb am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 21:06:13 +00:00
Zach Jang
00721b4afa am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-21 18:58:12 +00: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
Zach Jang
c87ceb7ec1 am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:04:18 +00:00
Michael Wright
dab743b95c Always show pairing dialog for device-specific keyboard. 
Bug: 22876536
Change-Id: Ief9f6343d435747050bb7910f934e4777f5116de
 2015-09-17 15:23:46 +01:00
Hyejin
7837e0272b am 375633ae: am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check 
* commit '375633aea2a5ba9b0fc3b099bead8bbfef6a4cf3':
  Fix IndexOutOfBoundsException while silent provisioning check
 2015-09-15 00:49:17 +00:00
Hyejin
375633aea2 am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check 
* commit '1dcb1135b8157977cd44c05768f422243d64df83':
  Fix IndexOutOfBoundsException while silent provisioning check
 2015-09-15 00:45:21 +00:00
Hyejin
7e84e35fb1 am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check 
* commit '5565b5cd7537e9360e6382507a45cf5e091a5108':
  Fix IndexOutOfBoundsException while silent provisioning check
 2015-09-15 00:29:32 +00:00
Hyejin
5565b5cd75 Fix IndexOutOfBoundsException while silent provisioning check 
- If hostpot off, we receive result through HotspotOffReceiver.
  Sometimes, during provisioning, we're used to receive this.
  In this case, we don't care.
  After provisioning, we'll receive the intent again.

- In stress test,
  index is sometimes invalid, equals to mCurrentTethers.size().
  So, when provisioning, We check whether index is valid or not.

BUG=23528220
Change-Id: I70f35e045042c6c81b1db03e2a44cd41d3e7437f
 2015-09-14 16:04:52 -07:00
Paul Lawrence
4f60679b76 Remove don't kill flag from CryptKeeper to stop logspam 
Bug: 23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
 2015-09-14 14:55:57 -07:00
Zach Jang
6ceb2ba9b8 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings 
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
 2015-09-14 14:03:12 -07:00
Maurice Lam
2662df8433 [WifiSettings] Submit Wi-Fi dialog with enter key 
Add a OnKeyListener for hardware keyboards and an
OnEditorActionListener for on-screen IMEs to submit the Wi-Fi dialog
with the currently entered information.

Before committing the action, check for whether the dialog is
submittable -- that is checking whether all necessary information has
been entered. If not the enter key behaves the same as it is before
the change.

Bug: 22211604
Change-Id: Idede4233a7385d3bcd8fd6614948270280536bf1
 2015-09-14 12:07:06 -07:00
Selim Cinek
e3be8eb3e5 am f19b9b6d: am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 
* commit 'f19b9b6d88f87a12723b3bf52f8d03bb6a831e83':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
 2015-09-12 05:07:53 +00:00
Jorim Jaggi
22bf95e650 am fb5aa541: am d59ce1f4: am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev 
* commit 'fb5aa5418ce4c103d8b2aa500cc4351e4b141397':
  Add timeout if we dont get onEnterAnimationComplete
 2015-09-12 02:57:18 +00:00
Jorim Jaggi
30c5aed420 am c350cd0f: am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev 
* commit 'c350cd0f87cb0c23e58159b8b75022fed5ce97d8':
  Finish trampoline activity for ConfirmDeviceCredential immediately
 2015-09-12 02:57:17 +00:00
Selim Cinek
f19b9b6d88 am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev 
* commit '0fe43c9aec51d6389aa3e6943190a75a62b641be':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
 2015-09-12 00:56:55 +00:00