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

10185 Commits

Author SHA1 Message Date
Jason Monk
06621a57fd am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev 
* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
  Fix battery detail issues with "Android OS"
 2015-07-23 22:42:06 +00:00
Jason Monk
5b3921e44a am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev 
* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
  Don't show disabled apps in ignore optimizations
 2015-07-23 22:42:05 +00:00
Guang Zhu
8a4dda6786 am c1bef743: Prevent monkey from changing adoptable storage settings 
* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
  Prevent monkey from changing adoptable storage settings
 2015-07-23 22:41:48 +00:00
Svetoslav Ganov
cce844a7a3 Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev 2015-07-23 21:47:10 +00:00
Maurice Lam
95d1eb90d3 am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 20:26:15 +00:00
Maurice Lam
4e05ceea19 am 3b798650: am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '3b798650fc30a6b2b3b7a28325b7b40b8173baf1':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 20:26:14 +00:00
Jason Monk
8bf5f3075e Merge "Fix battery detail issues with "Android OS"" into mnc-dev 2015-07-23 20:23:57 +00:00
Jason Monk
9927acd3ad Merge "Don't show disabled apps in ignore optimizations" into mnc-dev 2015-07-23 20:23:09 +00:00
Maurice Lam
cff4eb9b73 am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 20:09:28 +00:00
Maurice Lam
3b798650fc am 06dc5930: am 705def9a: am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '06dc59305fa7e0f72245471763843dcb8997f4e0':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 20:09:27 +00:00
Maurice Lam
7a33511397 am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-23 19:18:51 +00:00
Maurice Lam
705def9a22 am f1fbf9cc: am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit 'f1fbf9cca44d8a16bc1af92964558cf91ac00161':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-23 19:18:50 +00:00
Pavel Zhamaitsiak
8a222530be am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 
* commit 'd9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
  Add or remove WFC setting when Wireless settings activity is resumed
 2015-07-23 18:27:36 +00:00
Jason Monk
e2840f1ce3 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev 
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
 2015-07-23 18:27:32 +00:00
Guang Zhu
c1bef7430e Prevent monkey from changing adoptable storage settings 
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
 2015-07-23 10:57:59 -07:00
Pavel Zhamaitsiak
d9e0ed1b3e Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev 2015-07-23 16:54:55 +00:00
Svet Ganov
841bb3d336 Reset permissions and app links when clearing app preferences - settings 
bug:22359132

Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
 2015-07-23 09:40:16 -07:00
Pavel Zhamaitsiak
3e7e2c57d4 Add or remove WFC setting when Wireless settings activity is resumed 
WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.

Bug: 22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458
 2015-07-23 09:31:58 -07:00
Maurice Lam
5f8d7dbe52 [Fingerprint] Show skip button during SUW 
Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.

Bug: 22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1
 2015-07-22 16:51:47 -07:00
Maurice Lam
2f2779acce am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
 2015-07-22 20:17:37 +00:00
Maurice Lam
9dd92338d0 am 3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 
* commit '3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
  [Fingerprint] Send RESULT_CANCELED when back from Add another
 2015-07-22 20:17:34 +00:00
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Yasuhiro Matsuda
4a109b1d87 Handle the case where USB_STATE intent is not received yet. 
Call updateUsbConfigurationValues() when ACTION_USB_STATE intent
is not yet received so that mUsbConfiguration value is properly
initialized in this case.

BUG: 22163689
Change-Id: I2aeed43fc49e40c52cdc2bfc08d43081815b49d1
 2015-07-22 23:20:05 +09:00
Jason Monk
82f30d2a41 Fix battery detail issues with "Android OS" 
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
 2015-07-22 10:12:05 -04:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
3c1f46dc2c Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev 2015-07-21 23:39:35 +00:00
Jorim Jaggi
f5b17e5588 Move PIN/Pattern appear animation to RenderThread (2/2) 
Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
 2015-07-21 15:34:26 -07:00
Maurice Lam
da433902d4 [Fingerprint] Send RESULT_CANCELED when back from Add another 
Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.

This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
  FingerprintEnrollFinish. If the user clicks back in
  FingerprintEnrollEnrolling, they will always go back to the
  previous screen with RESULT_CANCELED, which would either be
  FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
  possible outside of Setup Wizard, they will be back in Find Sensor,
  and pressing next will enroll an additional fingerprint.
  - Edge case: if the user enrolled the maximum number of
    fingerprints, and presses back, they will be bounced all the way
    back to Settings > Security.

Bug: 22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d
 2015-07-21 15:23:11 -07:00
Billy Lau
2e407c317a am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:51:31 +00:00
Billy Lau
90bc96f83d am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'f7011298eda26b6972a36a9735182fa6afd35093':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:36:48 +00:00
Billy Lau
bc3695c231 am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:06:42 +00:00
Amit Mahajan
dd871497f0 am e6e41f45: am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'e6e41f453d608b443be315f5e1a223054bfd2b68':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:58:22 +00:00
Billy Lau
3d861fd129 am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit 'd06ba151f5cc966bf05b2ac0146602d31ae81c4a':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 17:54:01 +00:00
Amit Mahajan
e6e41f453d am a38dfb03: am c5459430: am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'a38dfb03c4054dbe08ffab01b8d42329e91fd639':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:44:46 +00:00
Billy Lau
d06ba151f5 Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 2015-07-21 17:37:08 +00:00
Amit Mahajan
c5459430a0 am 480692fa: am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit '480692fab398a080be6648ddf424b3129f2c6cbc':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:17:45 +00:00
Amit Mahajan
c1d2289bc6 am e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 
* commit 'e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
  Fix bug to force to close once change Bearer on APN
 2015-07-21 17:11:00 +00:00
Amit Mahajan
e8357caad8 Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev 2015-07-21 16:57:13 +00:00
Billy Lau
bb3aa2632a Bug 21589105 Rescope WRITE_SETTINGS (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 needing this capability can
launch the summary UX through a specific intent.

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

strings.xml:
Increased the CHAR limits for some strings due to requests from translators.

Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
 2015-07-21 17:44:49 +01:00
Julia Reynolds
dd8f30541c am 08b94d5b: am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit '08b94d5b067fb68ba049aa611853bf102a4495d2':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 16:23:52 +00:00
Julia Reynolds
08b94d5b06 am 3d94772b: am 6712be4a: am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit '3d94772b082ff9e359e6ad9ebe2ea48292421966':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 16:10:31 +00:00
Julia Reynolds
6712be4a70 am d409b700: am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit 'd409b70093211df215bc117ccf9ba8d0924e983f':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 15:44:21 +00:00
Julia Reynolds
cb271219c3 am f516e7dd: Make \'fingerprint\' searchable in Settings. 
* commit 'f516e7dde0074416dbf51650cbfb9cc763027b27':
  Make 'fingerprint' searchable in Settings.
 2015-07-21 15:30:45 +00:00
Julia Reynolds
f516e7dde0 Make 'fingerprint' searchable in Settings. 
Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc
 2015-07-21 14:28:40 +00:00
Jason Monk
94f9c824c4 Don't show disabled apps in ignore optimizations 
Bug: 22612760
Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d
 2015-07-21 09:30:18 -04:00
Daichi Hirono
35197218fc Merge "Turn the eject menu into a button." 2015-07-21 06:14:37 +00:00
Maurice Lam
7e83103020 [ScreenLock] Style encryption interstitial in SUW 
When running in setup wizard, style the encryption interstitial using
styles from Setup Wizard library, to be consistent with the rest of
the setup flow.

Bug: 22587892
Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
 2015-07-20 21:06:21 -07:00
Maurice Lam
fed7de4546 am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
  [ScreenLock] Change title of encryption interstitial
 2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683 am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev 
* commit '6e512e0815c8678621077008498f18e73402ecc3':
  [Fingerprint] Change message in encryption
 2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
  [ScreenLock] Change title for RedactionInterstitial
 2015-07-21 01:37:06 +00:00