PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,599 Commits 1 Branch 0 Tags
65e940b8c13a0a89c80cf1b83c2cd946ad2b9552
Commit Graph

11027 Commits

Author SHA1 Message Date
Maurice Lam
a33b68af3e am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev 
* commit 'd10026cbfde671448b702fde345da52ac7569d04':
  [Fingerprint] Change message in encryption
 2015-07-21 00:33:14 +00:00
Maurice Lam
ac4b7fac6b am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 
* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
  [ScreenLock] Change title for RedactionInterstitial
 2015-07-21 00:33:13 +00:00
Maurice Lam
d10026cbfd Merge "[Fingerprint] Change message in encryption" into mnc-dev 2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831 Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 2015-07-21 00:22:03 +00:00
Jim Miller
9e81045a95 am 717f4879: am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev 
* commit '717f487964b2e0029119b591f7f241e3262f7006':
  Don't launch ConfirmDeviceCredentials multiple times.
 2015-07-21 00:16:03 +00:00
Jason Monk
c2f431debe am 97c68c18: am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev 
* commit '97c68c181dba345139e6ae98cdc4128b1744e1a0':
  Handle monkey crash
 2015-07-21 00:14:01 +00:00
Sungmin Choi
fab7c109b7 Fix bug to force to close once change Bearer on APN 
Bug: 22544257
Change-Id: I43eea4034c3d106b8e3f8e4f999f389db04b7567
 2015-07-20 17:09:42 -07:00
Maurice Lam
5cceb312fd [ScreenLock] Change title for RedactionInterstitial 
Change the title for RedactionInterstital to "Notifications".

Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
 2015-07-20 23:42:52 +00:00
Jim Miller
717f487964 am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev 
* commit 'b858853dc395498acc75422e568d7156062c4f9c':
  Don't launch ConfirmDeviceCredentials multiple times.
 2015-07-20 23:38:06 +00:00
Jim Miller
a8f8879895 am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev 
* commit 'd74a36031cbe87a8a18f4ffc99aaa399245f181c':
  Don't launch ConfirmDeviceCredentials multiple times.
 2015-07-20 23:20:15 +00:00
Jim Miller
d55152afce am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev 
* commit '3977df037c1cdd1bef92e3f4195c6e7b847a1c28':
  Don't launch ConfirmDeviceCredentials multiple times.
 2015-07-20 23:05:05 +00:00
Jim Miller
0c6e18f24d Don't launch ConfirmDeviceCredentials multiple times. 
Fixes bug 18724944

Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
 2015-07-20 22:38:02 +00:00
Maurice Lam
15546c0b9d [ScreenLock] Change title of encryption interstitial 
Change the title of EncryptionInterstitial to "Secure start-up".

Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
 2015-07-20 15:23:41 -07:00
Maurice Lam
c0e7879684 [Fingerprint] Change message in encryption 
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.

Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
 2015-07-20 21:52:12 +00:00
Jason Monk
97c68c181d am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev 
* commit '8e350e80343dbfd8aafce275a25fff7124f3e9ce':
  Handle monkey crash
 2015-07-20 21:38:07 +00:00
Jason Monk
b48e56c9b2 am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev 
* commit '959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
  Handle monkey crash
 2015-07-20 21:08:04 +00:00
Jason Monk
cb4b45cc30 am 178c4099: Merge "Handle monkey crash" into mnc-dev 
* commit '178c40998df2d5196bc5913fca831880cfa47c50':
  Handle monkey crash
 2015-07-20 20:45:33 +00:00
Jason Monk
178c40998d Merge "Handle monkey crash" into mnc-dev 2015-07-20 20:32:29 +00:00
Christopher Tate
d2dcd30acd am 99e89859: am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev 
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
  Offer 'ask' as an available app-linking state
 2015-07-20 18:38:23 +00:00
Christopher Tate
99e8985959 am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev 
* commit 'ef1961c7326aa60e1e3bbb738394c535b7f952af':
  Offer 'ask' as an available app-linking state
 2015-07-20 18:17:05 +00:00
Christopher Tate
7cce6d0c52 am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev 
* commit 'f330857a17d29cec33ca0169cb30fdc69854ab52':
  Offer 'ask' as an available app-linking state
 2015-07-20 17:41:08 +00:00
Jason Monk
bd45c3cbe0 Handle monkey crash 
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.

Bug: 22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
 2015-07-20 13:40:40 -04:00
Christopher Tate
55073e0954 am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev 
* commit 'b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
  Offer 'ask' as an available app-linking state
 2015-07-20 17:25:17 +00:00
Christopher Tate
b852fcbde9 Merge "Offer 'ask' as an available app-linking state" into mnc-dev 2015-07-20 17:06:27 +00:00
Christopher Tate
2eda36509f Offer 'ask' as an available app-linking state 
Bug 22532193

Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
 2015-07-17 16:11:41 -07:00
Jim Miller
dfa1e04678 am 03bb45e1: am af5de85b: am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit '03bb45e1103ede787c6a465cd838e46b3818f397':
  Simplify FingerprintSettings
 2015-07-17 22:04:19 +00:00
Jim Miller
03bb45e110 am af5de85b: am 64117fef: am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit 'af5de85bc0797449005c028e21a8af7a3c460901':
  Simplify FingerprintSettings
 2015-07-17 21:49:34 +00:00
Xiaohui Chen
40e2437d77 Merge "sys user split: update createUser method" 2015-07-17 21:33:11 +00:00
Jim Miller
64117fef33 am 4b3bc882: am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit '4b3bc882ad2824a1f7d4362d8757ddb9c7ba21ce':
  Simplify FingerprintSettings
 2015-07-17 21:30:11 +00:00
Jim Miller
7120c7b6e6 am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev 
* commit 'bf9a425d5c3f61f02133084d11ab8481b0f53102':
  Simplify FingerprintSettings
 2015-07-17 21:15:56 +00:00
Jim Miller
bf9a425d5c Merge "Simplify FingerprintSettings" into mnc-dev 2015-07-17 21:05:07 +00:00
Jim Miller
8e83475024 Simplify FingerprintSettings 
There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.

Fixes bug 22438498

Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0
 2015-07-17 21:03:42 +00:00
Billy Lau
6897d6978e am 81e050aa: am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '81e050aad01c15484fe4e262c53475bd13c4782b':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:52:38 +00:00
Billy Lau
81e050aad0 am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '28f352483e2951339627be1867562cd4ca99f66e':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 19:29:21 +00:00
Billy Lau
e5a95396da am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit 'e104fced18056905286ee01a3ef8c3d12f2b9e4d':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 18:57:51 +00:00
Billy Lau
262b64e7a9 am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 
* commit '90a8a01b629694d28dd7e40a8f0253894fc14e02':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
 2015-07-17 18:39:18 +00:00
Billy Lau
90a8a01b62 Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev 2015-07-17 18:28:28 +00:00
Billy Lau
f8f9802104 Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)... 
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.

Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
 2015-07-17 18:23:57 +01:00
Daichi Hirono
5e76cdc9dd Turn the eject menu into a button. 
BUG=21897892

Change-Id: Icd0db7907b990447c99c4ae65816e85777df0f8e
 2015-07-17 15:26:15 +09:00
Christopher Tate
021c21816d am 0111096e: am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit '0111096eca186f771ed1cd65d10b9509d6b5ddec':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:40:50 +00:00
Christopher Tate
0111096eca am 5c3f34b7: am b42eb5e2: am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit '5c3f34b7e5ce05d134e7ec907758641a8bdf1932':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:27:45 +00:00
Christopher Tate
b42eb5e221 am 649cc87f: am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit '649cc87f994c0010e8fd7567b7cece77ffffb0fd':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-17 00:04:04 +00:00
Christopher Tate
feb343ad74 am ddaa142a: Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
* commit 'ddaa142a094a404d7c5e6d7eea93920f8ed16696':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 23:49:07 +00:00
Christopher Tate
ddaa142a09 Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
Bug 22504009

Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6
 2015-07-16 16:07:12 -07:00
Xiaohui Chen
8ae4680977 sys user split: update createUser method 
After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept.  This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.

Bug: 19913735
Change-Id: I407a877c11346409bad85e00038f6cfd3d126da3
 2015-07-16 14:34:00 -07:00
Jason Monk
b1d9536e58 Remove tuner from development settings 
It has a new home now.

Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
 2015-07-16 16:41:15 -04:00
Xiaohui Chen
33b17beb9d Merge "sys user split: fix user settings user list" 2015-07-16 17:46:08 +00:00
Kenny Guy
2a9b911a85 am 32b5ec83: am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev 
* commit '32b5ec834adfd5a14eaca23ece62aecfab143baa':
  Show disabled trust agents as off.
 2015-07-16 17:17:34 +00:00
Xiaohui Chen
148ef7795d sys user split: fix user settings user list 
Only end user switchable users should show up in this list.

BUG:19913735
Change-Id: Ifb83f159864f2210d779b5831c5a5c4dc5e6f4bb
 2015-07-16 10:09:37 -07:00
Xiaohui Chen
c49c26bf04 Merge "sys user split: refactor user settings" 2015-07-16 16:16:20 +00:00