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
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
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
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
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
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
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
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
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
Maurice Lam
052297172e
[Fingerprint] Export FingerprintEnrollIntroduction
...
Export FingerprintEnrollIntroduction activity under the permission
USE_FINGERPRINT so that setup wizard can start it.
Bug: 21695577
Change-Id: If466c6e484a4aa0c10382cfedab0aad10ae26702
2015-07-10 21:00:02 -07:00
Chris Wren
ef94267afd
import new view enums into MetricsLogger
...
Bug: 21114836
Change-Id: I9a6e00ab8d85726ca6505a28ca7a52aef5aa1e1a
2015-07-10 17:19:58 -04:00
Robin Lee
719cbc4acf
am d3b6832e
: am 7ba46433
: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
...
* commit 'd3b6832edb5530b23132e054135c7fe93f5f9384':
Match getLegacyVpn calls to changed interface
2015-07-10 19:26:09 +00:00
Rubin Xu
a383b02c43
am 8b9a9519
: am 331b9823
: Merge "Remove unused MediaFormat activity" into mnc-dev
...
* commit '8b9a9519c865d73ce10a5847b3b99b3cd339114e':
Remove unused MediaFormat activity
2015-07-10 19:16:48 +00:00
Robin Lee
7ba46433ae
Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
2015-07-10 19:05:41 +00:00
Jason Monk
9362385095
am c07450ae
: am 7ab3cf94
: Merge "Fix wifi not re-ordering" into mnc-dev
...
* commit 'c07450ae7449dd995499dd7cfd5c9367914d6b95':
Fix wifi not re-ordering
2015-07-10 19:04:47 +00:00
Rubin Xu
331b9823d0
Merge "Remove unused MediaFormat activity" into mnc-dev
2015-07-10 18:47:51 +00:00
Jason Monk
7ab3cf944d
Merge "Fix wifi not re-ordering" into mnc-dev
2015-07-10 18:37:19 +00:00
Jason Monk
088537a315
Fix wifi not re-ordering
...
Bug: 22361247
Change-Id: I5c25061735628682741060c8a699c0a977c4351b
2015-07-10 14:08:31 -04:00
Julia Reynolds
5a8b507e34
am a368f9a9
: am ddd887af
: Prevent crash when removing an account.
...
* commit 'a368f9a97405b6358515186614cd9f450119f937':
Prevent crash when removing an account.
2015-07-10 17:06:34 +00:00
Julia Reynolds
ddd887afc8
Prevent crash when removing an account.
...
Bug: 21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
2015-07-10 10:07:21 -04:00
Martijn Coenen
91dcad4089
Fix up Tap and Pay how it works.
...
Also, don't use HCE service description.
Bug: 21988684
Bug: 21657963
Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
2015-07-10 15:43:25 +02:00
Rubin Xu
af43d4ddb4
Remove unused MediaFormat activity
...
As part of cleanup of ExternalStorageFormatter.
Bug: 9433509
Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
2015-07-09 21:29:11 +01:00
Julia Reynolds
1bde325964
am df778e8e
: am 963e3fdd
: Merge "Talkback improvements for Settings screens." into mnc-dev
...
* commit 'df778e8e76ca41c517385b8c30a468eecc37d107':
Talkback improvements for Settings screens.
2015-07-09 19:25:24 +00:00
Jason Monk
0f24766c9a
am cfd4b754
: am 5c3b7c3a
: Merge "Don\'t clear data summary when loader is cancelled" into mnc-dev
...
* commit 'cfd4b754886534418d378d4065200c14844f2b09':
Don't clear data summary when loader is cancelled
2015-07-09 19:25:22 +00:00
Jason Monk
f2a3b6a05d
am e60ad922
: am b6b85325
: Merge "Fix rotation issues" into mnc-dev
...
* commit 'e60ad922de334286cfd36c7f3939d34096e69049':
Fix rotation issues
2015-07-09 19:25:19 +00:00
Julia Reynolds
963e3fdd05
Merge "Talkback improvements for Settings screens." into mnc-dev
2015-07-09 18:57:24 +00:00
Jason Monk
5c3b7c3ade
Merge "Don't clear data summary when loader is cancelled" into mnc-dev
2015-07-09 18:55:09 +00:00