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

22375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
bfa8e5d53b am 5d780aa9: am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit '5d780aa92175ae9d3b1204d67d0c23e943041d8e':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:48:20 +00:00
Jason Monk
a4dfe05b29 am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev 
* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
  Disable ignore battery optimization items that can't change
 2015-07-15 23:30:21 +00:00
Jason Monk
5d780aa921 am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev 
* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
  Change move storage from dropdown pref to dialog
 2015-07-15 23:30:19 +00:00
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
Jim Miller
399133d3f2 am 9b94f839: am ab5cdb2f: am 593fe777: am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '9b94f839d63bba8e1144e146d19001c585a29254':
  Fixed the layout for the fingerprint renaming
 2015-07-15 23:12:18 +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
194e92d3a0 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:03:58 +00:00
Jason Monk
7beb763da2 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:03:57 +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
Jim Miller
9b94f839d6 am ab5cdb2f: am 593fe777: am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit 'ab5cdb2f4d0557fd37092966ccd8cdfb42880561':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:55:48 +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
3603d8ad82 am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 
* commit '2ea2950d9c15e2da38d5aece8de7c0079539d99a':
  [Fingerprint] Add fingerprint enroll in setup wizard
 2015-07-15 22:47:19 +00:00
Jim Miller
ab5cdb2f4d am 593fe777: am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '593fe7778cde419f73d3ec331d028bd86a4f442b':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:47:18 +00:00
Maurice Lam
dfe3368bf6 am 649215a5: am e63322f6: resolved conflicts for merge of f90628c6 to mnc-dr-dev 
* commit '649215a50c65b512b51cd21b54e479cd4ff3b926':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-15 22:47:17 +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
Jim Miller
593fe7778c am 22e51c8b: am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '22e51c8b4f6622cc160d8652b8abe9db304b9a5a':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:32:45 +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
Maurice Lam
77352c65be 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 22:26:51 +00:00
Jim Miller
22e51c8b4f am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev 
* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
  Fixed the layout for the fingerprint renaming
 2015-07-15 22:26:50 +00:00
Maurice Lam
e63322f640 resolved conflicts for merge of f90628c6 to mnc-dr-dev 
Change-Id: I3b0729b1d00a4ca25d3a7127e27b4fc3a062d30d
 2015-07-15 14:57:06 -07: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
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
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
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
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
Geoff Mendal
265f33e6a5 am a3861e7c: (-s ours) am 9a635144: (-s ours) am 13b52d78: (-s ours) am 78aeabe8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a3861e7c504cd3794dc3b0f5593803cdbfbc1f10':
  Import translations. DO NOT MERGE
 2015-07-15 15:16:28 +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
a879f73735 am 06f09a03: (-s ours) am f71e13c8: (-s ours) am 32a9a993: (-s ours) am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE 
* commit '06f09a03812e58bf108546131d0fe51eb62a0513':
  Import translations. DO NOT MERGE
 2015-07-15 15:05:17 +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