PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,107 Commits 1 Branch 0 Tags
a41521465e88a2c29d6e41b735ed4593c3531c8c
Commit Graph

22107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
6b9d788914 Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 2015-07-15 19:18:06 +00:00
Maurice Lam
f90628c6ec Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev 2015-07-15 18:45:34 +00:00
Maurice Lam
8d1f9c9be5 [Fingerprint] Add fingerprint enroll in setup wizard 
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.

On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.

Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
 2015-07-15 11:14:22 -07:00
Maurice Lam
e1eaed079c [Fingerprint] Export FingerprintEnrollIntroduction 
Export FingerprintEnrollIntroduction activity under the permission
MANAGE_FINGERPRINT so that setup wizard can start it.

Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
(cherry picked from commit 052297172e)
 2015-07-15 11:09:25 -07:00
Selim Cinek
854d08be2b Fixed the layout for the fingerprint renaming 
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit abd67de1ad)
 2015-07-15 17:37:46 +00:00
Kenny Guy
9854dfaf1d Show disabled trust agents as off. 
When trust agents are disabled by the admin
show the greyed out toggle as off.

Bug: 22397930
Change-Id: I687a5dee0ca9bed5015a4af080270f7bafa5a37d
 2015-07-15 16:12:34 +00:00
Jason Monk
64570b2b70 am 06e549fa: am eb37daff: am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit '06e549fa180c7db867e0f80a4bac1bf8bd6174a3':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:51:18 +00:00
Jason Monk
06e549fa18 am eb37daff: am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit 'eb37daffa1291056d4ff99e94ea96e05a1e8f7b1':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:36:15 +00:00
Jason Monk
eb37daffa1 am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit 'b6cb215cbefc803b0a1510a7f7c606d4d5c10045':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:22:19 +00:00
Jason Monk
b6cb215cbe am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit 'cd075edf6dcff9ca9ff243760e032190acbdecdc':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:08:44 +00:00
Geoff Mendal
a3861e7c50 am 9a635144: (-s ours) am 13b52d78: (-s ours) am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9a635144e18c9942538ca884baadbc87f3693496':
  Import translations. DO NOT MERGE
 2015-07-15 15:03:29 +00:00
Jason Monk
cd075edf6d Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 2015-07-15 14:54:04 +00:00
Geoff Mendal
06f09a0381 am f71e13c8: (-s ours) am 32a9a993: (-s ours) am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit 'f71e13c80f69bcac79d958468a24ce957eeb397a':
  Import translations. DO NOT MERGE
 2015-07-15 14:48:43 +00:00
Geoff Mendal
9a635144e1 am 13b52d78: (-s ours) am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '13b52d781a3d7c7b2cb9dbd12ba5ca4650f634e2':
  Import translations. DO NOT MERGE
 2015-07-15 14:47:29 +00:00
Geoff Mendal
13b52d781a am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '78aeabe834c6efacbbb7712bdbdd100917e356f3':
  Import translations. DO NOT MERGE
 2015-07-15 14:35:26 +00:00
Geoff Mendal
f71e13c80f am 32a9a993: (-s ours) am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit '32a9a993f74c962858591b0d2293edddb37d1b43':
  Import translations. DO NOT MERGE
 2015-07-15 14:33:07 +00:00
Geoff Mendal
32a9a993f7 am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit '4c60755b310dfb54a1eb748fe184f6e928295b3d':
  Import translations. DO NOT MERGE
 2015-07-15 14:16:17 +00:00
Geoff Mendal
78aeabe834 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-15 14:15:34 +00:00
Geoff Mendal
ad3601989a Import translations. DO NOT MERGE 
Change-Id: I451d2757ef702a046bc62ee5940e510fa0b739ee
Auto-generated-cl: translation import
 2015-07-15 07:14:40 -07:00
Geoff Mendal
4c60755b31 am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit 'f3907176da3f17397f61bf48ba90ab08a9cd85f3':
  Import translations. DO NOT MERGE
 2015-07-15 14:07:41 +00:00
Geoff Mendal
f3907176da Import translations. DO NOT MERGE 
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
 2015-07-15 06:56:45 -07:00
xinhe
5c9874cefd am 53d67679: am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '53d676791b55b39364bfe9d3aa47379724e2c2f1':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:47:49 +00:00
xinhe
53d676791b am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '9d95d88442babaa3511d28d89e05a244b97a7bdf':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:39:58 +00:00
xinhe
9d95d88442 am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '7e23bae6c6d8697c1f53ed4a3b8b467d3142fd76':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:26:08 +00:00
xinhe
7e23bae6c6 am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit 'd7fb46de591943c402dd13551ca603081ac4e6a7':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-14 23:13:03 +00:00
xinhe
d7fb46de59 Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 2015-07-14 22:29:32 +00:00
Jim Miller
5fe6880578 am 9f2fdd4b: am b8d1fc6b: am a41eb2fa: am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit '9f2fdd4bb02b3dade16a12d61e579d360ac00db6':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:56:33 +00:00
Jim Miller
9f2fdd4bb0 am b8d1fc6b: am a41eb2fa: am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit 'b8d1fc6b3c7564ec7d7f731f79a9f2879a90ad5b':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:43:47 +00:00
xinhe
cbdcca6cf6 Need to disable 5GHz bands for WiFi tethering in Japan 
b/22396383

Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
 2015-07-14 14:39:43 -07:00
Jim Miller
b8d1fc6b3c am a41eb2fa: am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit 'a41eb2faaa4f86b77fe6fa2273f4a84216b5920c':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:33:14 +00:00
Jim Miller
a41eb2faaa am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit 'e641e7d706095b54ac89f6fcb58c66e2190f46c7':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 21:18:39 +00:00
Jason Monk
63c7e4c26f am 4f7e1968: am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit '4f7e1968eab4afb4b65a80def2e80f20d1bff593':
  Add content description to wifi networks
 2015-07-14 21:12:23 +00:00
Jason Monk
4f7e1968ea am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'd03f041a06af8fe31c7fffd4aa9c975e2b5151e6':
  Add content description to wifi networks
 2015-07-14 21:02:18 +00:00
Jim Miller
e641e7d706 Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 2015-07-14 21:02:02 +00:00
Jason Monk
d03f041a06 am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'fd44d346bcaae6e8267aa4767ad70037d436e1e4':
  Add content description to wifi networks
 2015-07-14 20:47:33 +00:00
Jason Monk
fd44d346bc am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'acc70a3a3262aef48b2efab90f14328f818a9aef':
  Add content description to wifi networks
 2015-07-14 20:30:19 +00:00
Narayan Kamath
5152086a17 am 83a25842: Merge "Lose some deprecated test annotations." 
* commit '83a25842e720ddb838519e194679b464d0114301':
  Lose some deprecated test annotations.
 2015-07-14 20:27:36 +00:00
Jason Monk
acc70a3a32 Merge "Add content description to wifi networks" into mnc-dev 2015-07-14 20:20:40 +00:00
Billy Lau
509f2fe51c am bd5ae865: am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit 'bd5ae86579d7aeebc2cff415f1ed355f269387d5':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 19:23:52 +00:00
Billy Lau
bd5ae86579 am 254ce51b: am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit '254ce51b129a6b6a8f98b4641895ab085a3936c9':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 19:08:46 +00:00
Jason Monk
f05248f88f Fix Help menu for PrivateVolumeSettings 
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.

Bug: 22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
 2015-07-14 15:00:22 -04:00
Billy Lau
254ce51b12 am de784e6a: am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit 'de784e6ab5e86eb780cdeee4a2f01e2db9a1ef07':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 18:51:58 +00:00
Billy Lau
de784e6ab5 am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 
* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
 2015-07-14 18:36:53 +00:00
Jorim Jaggi
983e99dcf1 am 07a9d3b3: am d4391c22: am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '07a9d3b3123a0c22b9409f0464b82bc62f7319c9':
  Disable voice input if assist is voice service
 2015-07-14 18:28:27 +00:00
Wei Liu
751d0e6701 am e6023574: am cfb053f5: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 
* commit 'e60235748c01ee5b7d083b642920006565b08c9a':
  Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
 2015-07-14 18:28:26 +00:00
Billy Lau
52df60d83d Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev 2015-07-14 18:22:30 +00:00
Jorim Jaggi
07a9d3b312 am d4391c22: am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit 'd4391c22d147cbf97823e14fbe16d0a97b195dd3':
  Disable voice input if assist is voice service
 2015-07-14 18:19:31 +00:00
Wei Liu
e60235748c am cfb053f5: Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 
* commit 'cfb053f590b9c972010ef4c7f78156121eb70276':
  Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.
 2015-07-14 18:19:30 +00:00
Jason Monk
aa7a7740a1 am b2805789: am 3aee5d79: am 19186edd: am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit 'b2805789352f60853e087b6886e022724b550645':
  Disable notification volume when user restricted
 2015-07-14 18:14:54 +00:00
Martijn Coenen
9670159d46 am f5f40191: am bafffd14: am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit 'f5f40191a594d192a90c0e3052b78d29146b15ff':
  Fix up Tap and Pay how it works.
 2015-07-14 18:14:45 +00:00