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

10364 Commits

Author SHA1 Message Date
Jason Monk
543d68cc3a am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:20:43 +00:00
Jason Monk
f9d8deffaa am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit '7beb763da239fb71f214cab0587ae52f383985fc':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:20:41 +00:00
Maurice Lam
90cc69eeee am 614cf892: am 3603d8ad: am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '614cf892a6b8813461ff7e5619cb3bc062afcbf6':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 23:12:19 +00:00
Maurice Lam
ecf1c04f68 am d3107ce4: am dfe3368b: am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev 
* commit 'd3107ce40fe4bcabf6d65ad26659b938da610905':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 23:12:17 +00:00
Jason Monk
94b7585895 am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '509726054a3efc09d65d6c15f485ea6f1da2d272':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:01:53 +00:00
Jason Monk
5fa374cc20 am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit '4a6b909559d50e02833afd5119876df070dfd458':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:01:51 +00:00
Maurice Lam
614cf892a6 am 3603d8ad: am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '3603d8ad823796a279007feb7af8b00bc532a26e':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 22:55:49 +00:00
Maurice Lam
d3107ce40f am dfe3368b: am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev 
* commit 'dfe3368bf67e5bee41fe92a9cca0879007199bcb':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 22:55:47 +00:00
Jason Monk
509726054a Merge "Disable ignore battery optimization items that can't change" into mnc-dev 2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559 Merge "Change move storage from dropdown pref to dialog" into mnc-dev 2015-07-15 22:48:06 +00:00
Maurice Lam
2ea2950d9c am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '77352c65be3d4106da93609794610d88347e069b':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 22:32:46 +00:00
Maurice Lam
649215a50c am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev 
* commit 'e63322f640cf955ba296e064b07e4920d334f851':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 22:32:43 +00:00
Jason Monk
e8400c2fb7 Change move storage from dropdown pref to dialog 
Use a horizontal pref and a single button that triggers the dialog

Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
 2015-07-15 16:59:28 -04:00
Maurice Lam
58a6af1496 am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 19:38:05 +00:00
Maurice Lam
4595978b72 Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 2015-07-15 19:28:06 +00:00
Jason Monk
443513cc0d Disable ignore battery optimization items that can't change 
Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
 2015-07-15 15:22:38 -04:00
Maurice Lam
d7be0656ff am f90628c6: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dev 
* commit 'f90628c6ec8cf80b44b9559db448eb9537b41fdc':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 18:55:57 +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
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
02da7d3b11 am 64570b2b: am 06e549fa: am eb37daff: am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit '64570b2b70afecad5936f6a39c09023ff6c1a625':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 16:04:57 +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
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
Jason Monk
4a3819027a am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 
* commit 'cd075edf6dcff9ca9ff243760e032190acbdecdc':
  Fix Help menu for PrivateVolumeSettings
 2015-07-15 15:07:21 +00:00
Jason Monk
cd075edf6d Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev 2015-07-15 14:54:04 +00:00
xinhe
9c43d78421 am 5c9874ce: am 53d67679: am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 
* commit '5c9874cefd9bc35c191c85a7744734b0a90a055c':
  Need to disable 5GHz bands for WiFi tethering in Japan
 2015-07-15 00:04:00 +00: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
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
e9c822b0c6 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 22:40:35 +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
cf9e50bb5f am 5fe68805: am 9f2fdd4b: am b8d1fc6b: am a41eb2fa: am e641e7d7: Merge "Postpone call to postEnroll() until we actually leave activity." into mnc-dev 
* commit '5fe6880578e74dfc72370dbf07a4d5d798e9b553':
  Postpone call to postEnroll() until we actually leave activity.
 2015-07-14 22:12:06 +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
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
Jason Monk
84796d0f64 am 63c7e4c2: am 4f7e1968: am d03f041a: am fd44d346: am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit '63c7e4c26ff9b8c7fc595770eaa816cc711f7688':
  Add content description to wifi networks
 2015-07-14 21:28:07 +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
Jim Miller
52374856e8 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:14:59 +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
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
810448204f am acc70a3a: Merge "Add content description to wifi networks" into mnc-dev 
* commit 'acc70a3a3262aef48b2efab90f14328f818a9aef':
  Add content description to wifi networks
 2015-07-14 20:31:52 +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
Jason Monk
acc70a3a32 Merge "Add content description to wifi networks" into mnc-dev 2015-07-14 20:20:40 +00:00
Billy Lau
5742b87e5c am 509f2fe5: 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 '509f2fe51c84e2c0c2d83770710dc8572d0c2223':
  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:39:17 +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
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