PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,688 Commits 1 Branch 0 Tags
b8d1fc6b3c7564ec7d7f731f79a9f2879a90ad5b
Commit Graph

20688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jason Monk
acc70a3a32 Merge "Add content description to wifi networks" into mnc-dev 2015-07-14 20:20:40 +00: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
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
d4391c22d1 am 464e54f8: am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '464e54f88b4aa933a7d26cb1afecf0ddfc282751':
  Disable voice input if assist is voice service
 2015-07-14 18:13:27 +00:00
Wei Liu
cfb053f590 Merge "Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib." into cw-e-dev 2015-07-14 18:08:35 +00:00
Jorim Jaggi
464e54f88b am 8505d4a5: Merge "Disable voice input if assist is voice service" into mnc-dev 
* commit '8505d4a51d1112ea71f7df680cf85378a9567bde':
  Disable voice input if assist is voice service
 2015-07-14 18:04:11 +00:00
Jason Monk
2ecd295d56 Add content description to wifi networks 
Bug: 22468835
Change-Id: Ifd9d0384030befbd221b14599159348bf56d41c8
 2015-07-14 14:00:07 -04:00
Jorim Jaggi
8505d4a51d Merge "Disable voice input if assist is voice service" into mnc-dev 2015-07-14 17:50:34 +00:00
Jason Monk
3aee5d790c am 19186edd: am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit '19186edddb32efc43e7f00faea0436c36b702290':
  Disable notification volume when user restricted
 2015-07-14 14:18:00 +00:00
Jason Monk
19186edddb am 7713fe26: Merge "Disable notification volume when user restricted" into mnc-dev 
* commit '7713fe26d2151a7ba8e9970d90f55ae184d48b7d':
  Disable notification volume when user restricted
 2015-07-14 14:02:27 +00:00
Jason Monk
7713fe26d2 Merge "Disable notification volume when user restricted" into mnc-dev 2015-07-14 13:53:29 +00:00
Martijn Coenen
bafffd149a am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '35738049df5aa6b14ef0721375cf40c5e7c60539':
  Fix up Tap and Pay how it works.
 2015-07-14 10:13:58 +00:00
Martijn Coenen
35738049df am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev 
* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
  Fix up Tap and Pay how it works.
 2015-07-14 07:57:35 +00:00
Martijn Coenen
8d9bb1ae1d Merge "Fix up Tap and Pay how it works." into mnc-dev 2015-07-14 07:45:01 +00:00
Jorim Jaggi
0798ef0523 Disable voice input if assist is voice service 
Bug: 22358252
Change-Id: Id4a9de8c5287c5e025d0ccc7f98edd8855db519c
 2015-07-14 04:13:57 +00:00
Jason Monk
381b1758f6 am 5250cc00: am 53dd1d4d: Merge "Fix app icon size" into mnc-dev 
* commit '5250cc0007291bd946d6ac582d34af3440a8392f':
  Fix app icon size
 2015-07-13 23:34:50 +00:00
Sanket Padawe
389fbb748c am 2db9291e: am 7995ca41: Use same technology type for LTE/4G 
* commit '2db9291ea4ba1d880ebcc976c65b12dd24d080ad':
  Use same technology type for LTE/4G
 2015-07-13 23:34:48 +00:00
Chris Wren
209a72cab1 am b6d8b5f6: am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit 'b6d8b5f6a4dfd5838f9e35d9ddd840e80f5bfec6':
  import new view enums into MetricsLogger
 2015-07-13 23:34:47 +00:00
Geoff Mendal
1e9aca417c am d8b05ce2: (-s ours) am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd8b05ce25f1f4c3d0686b4a45f8c5ba8bcec6fbb':
  Import translations. DO NOT MERGE
 2015-07-13 23:34:46 +00:00
Zoltan Szatmary-Ban
e4e520641d am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 
* commit 'c968c407f809f06dda02dffe25ea2a4ee9f4cb15':
  Do not throw exception when MeasurementDetails.mediaSize is empty
 2015-07-13 23:34:45 +00:00
Geoff Mendal
ed45bc3070 am 92a33ff7: (-s ours) am da15ade8: (-s ours) Import translations. DO NOT MERGE 
* commit '92a33ff73e5447fe89ed091e96efb07f8e6cfcfd':
  Import translations. DO NOT MERGE
 2015-07-13 23:34:44 +00:00
Jason Monk
5250cc0007 am 53dd1d4d: Merge "Fix app icon size" into mnc-dev 
* commit '53dd1d4deea9968f1255018248ff0393252032dd':
  Fix app icon size
 2015-07-13 23:01:59 +00:00
Sanket Padawe
2db9291ea4 am 7995ca41: Use same technology type for LTE/4G 
* commit '7995ca4165cae43b9bff25a6e6eafdb51445b698':
  Use same technology type for LTE/4G
 2015-07-13 23:01:45 +00:00
Chris Wren
b6d8b5f6a4 am 2f8bb8ea: Merge "import new view enums into MetricsLogger" into mnc-dev 
* commit '2f8bb8ea97e87cacbe307c1d78fa7a6e096530eb':
  import new view enums into MetricsLogger
 2015-07-13 23:01:29 +00:00
Geoff Mendal
d8b05ce25f am 536ed184: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '536ed1847863776335576699cdbe828b62f35a0f':
  Import translations. DO NOT MERGE
 2015-07-13 23:01:18 +00:00
Zoltan Szatmary-Ban
c968c407f8 am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 
* commit '098c296df2388bbcc906e8e149743eea7467b0a8':
  Do not throw exception when MeasurementDetails.mediaSize is empty
 2015-07-13 23:01:11 +00:00
Geoff Mendal
92a33ff73e am da15ade8: (-s ours) Import translations. DO NOT MERGE 
* commit 'da15ade8300bb875b8d874e1f68032f6ffe95719':
  Import translations. DO NOT MERGE
 2015-07-13 23:00:39 +00:00
Jim Miller
e9785ac1e4 Postpone call to postEnroll() until we actually leave activity. 
The existing code was calling postEnroll() too soon, which resulted
in the inability to add more than one fingerprint. The solution is to
only call postEnroll() when we're leaving the activity.

Fixes bug 22438498

Change-Id: Ia134899e12b4edc9cced834e99cb2bfd2d51321f
 2015-07-13 16:00:25 -07:00
Maurice Lam
39f92c0f54 am c6178ba0: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 
* commit 'c6178ba01236b60e90cc993103c633ea7eca299d':
  [Fingerprint] Export FingerprintEnrollIntroduction
 2015-07-13 22:34:42 +00:00
Billy Lau
7f70ba18e6 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an 
explicit toggle to be enabled through Settings via Apps -> Advanced Apps.

Added new and refactored an old xml to define the UX for two new Preferences
in Advanced Settings. Modified the existing AdvancedAppSettings to add
control flow for two new settings. Also enriched ManageApplications to
handle these cases. Added additional strings in xml/values/strings.xml
to support these settings. Also defined new classes to handle these the
toggle of these permissions per app.

Refactored codes from AppStateUsageBridge to a generic AppStateAppOpsBridge so
that future usages related to AppOps can inherit from this class.

Change-Id: I43b81282a063e05844c7805556a6d05cfc02bcdb
 2015-07-13 22:39:49 +01:00
Maurice Lam
c6178ba012 Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev 2015-07-13 20:20:57 +00:00
Jason Monk
26cc9fcf66 Disable notification volume when user restricted 
Bug: 22327825
Change-Id: I892627e00d9ebe2cd67348ce6da3c9c7bc0251fc
 2015-07-13 15:15:36 -04:00
Wei Liu
de557d48ba Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib. 
Change-Id: Id6189e600eb2adb67f31d079a5a5ecfc99addccc
 2015-07-13 12:01:42 -07:00
Jason Monk
53dd1d4dee Merge "Fix app icon size" into mnc-dev 2015-07-13 18:05:54 +00:00
Sanket Padawe
7995ca4165 Use same technology type for LTE/4G 
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true

Bug: 22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
 2015-07-13 10:15:41 -07:00
Chris Wren
2f8bb8ea97 Merge "import new view enums into MetricsLogger" into mnc-dev 2015-07-13 16:21:26 +00:00
Jason Monk
061c8af3d6 Fix app icon size 
Bug: 22425103
Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
 2015-07-13 12:18:43 -04:00
Geoff Mendal
c2175d7842 am a52bf201: (-s ours) Import translations. DO NOT MERGE 
* commit 'a52bf2017292a6da41d9b6950a1564710a94367e':
  Import translations. DO NOT MERGE
 2015-07-13 15:11:43 +00:00
Geoff Mendal
b30eaa843c am 7174a3d7: (-s ours) Import translations. DO NOT MERGE 
* commit '7174a3d7011fa4456bebe7e7b55f47aaed013d29':
  Import translations. DO NOT MERGE
 2015-07-13 15:10:40 +00:00
Geoff Mendal
a52bf20172 Import translations. DO NOT MERGE 
Change-Id: I75a6759a8ccd3a922121912e0c2bdb291fda3e56
Auto-generated-cl: translation import
 2015-07-13 07:08:00 -07:00
Geoff Mendal
536ed18478 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-13 13:54:00 +00:00
Geoff Mendal
a0838470f3 Import translations. DO NOT MERGE 
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
 2015-07-13 06:53:26 -07:00
Zoltan Szatmary-Ban
098c296df2 Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 2015-07-13 13:09:54 +00:00
Zoltan Szatmary-Ban
706e7014d8 Do not throw exception when MeasurementDetails.mediaSize is empty 
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:

mVolume == null || !mVolume.isMountedReadable()

Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
 2015-07-13 12:37:31 +01:00