Sanket Padawe
c06f9b6721
Use common xml file for multi-tab settings.
...
Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
2015-07-14 11:13:43 -07: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
eda414e5bd
am ec786ebd
: am 381b1758
: am 5250cc00
: am 53dd1d4d
: Merge "Fix app icon size" into mnc-dev
...
* commit 'ec786ebd8c725150711a496929463680c8d18d5e':
Fix app icon size
2015-07-14 16:25:31 +00:00
Sanket Padawe
ed6c19aefa
am b1167763
: am 389fbb74
: am 2db9291e
: am 7995ca41
: Use same technology type for LTE/4G
...
* commit 'b11677635ad12105e4adc0cae6099713a12371f1':
Use same technology type for LTE/4G
2015-07-14 16:25:24 +00:00
Chris Wren
7734e80798
am 95ac6029
: am 209a72ca
: am b6d8b5f6
: am 2f8bb8ea
: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '95ac602959ce41465ab8e8922659c471a33e7fed':
import new view enums into MetricsLogger
2015-07-14 16:25:20 +00:00
Geoff Mendal
e3f33af29b
am f1507ef3
: (-s ours) am 1e9aca41
: (-s ours) am d8b05ce2
: (-s ours) am 536ed184
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'f1507ef3dd8b296329d514ec87a6efbcc8ac249e':
Import translations. DO NOT MERGE
2015-07-14 16:25:19 +00:00
Zoltan Szatmary-Ban
ba79dc4d32
am 0998e03a
: am e4e52064
: am c968c407
: am 098c296d
: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit '0998e03a8dfa01cf62649e2d277e0b8556b1ffc9':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 16:25:17 +00:00
Geoff Mendal
14940f9bc6
am 4c415361
: (-s ours) am ed45bc30
: (-s ours) am 92a33ff7
: (-s ours) am da15ade8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4c41536153d381f1b9b00e7ef74e5e5d50530caa':
Import translations. DO NOT MERGE
2015-07-14 16:25:16 +00:00
Jason Monk
b280578935
am 3aee5d79
: am 19186edd
: am 7713fe26
: Merge "Disable notification volume when user restricted" into mnc-dev
...
* commit '3aee5d790cf74661f358ae8ad73dccba243a7f41':
Disable notification volume when user restricted
2015-07-14 14:28:55 +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
Narayan Kamath
83a25842e7
Merge "Lose some deprecated test annotations."
2015-07-14 10:48:09 +00:00
Martijn Coenen
f5f40191a5
am bafffd14
: am 35738049
: am 8d9bb1ae
: Merge "Fix up Tap and Pay how it works." into mnc-dev
...
* commit 'bafffd149aa6cf56bd7ac7c728d0a5442aca4d2c':
Fix up Tap and Pay how it works.
2015-07-14 10:26:33 +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
Maurice Lam
9fa8d9f248
[Fingerprint] Use accent color for fingerprint highlight
...
Set the fingerprint activated color, while registering a new
fingerprint to be 50% alpha of the accent color. This allows the
color to be changed with the theme, so that it will be highlighted
blue during setup wizard.
Bug: 21695577
Change-Id: Iee68506a4fbb8e8996bdb52694992ac460ae943d
2015-07-14 01:22:38 +00:00
Jason Monk
ec786ebd8c
am 381b1758
: am 5250cc00
: am 53dd1d4d
: Merge "Fix app icon size" into mnc-dev
...
* commit '381b1758f69a267e5e83d8d35319e1cf8da2884f':
Fix app icon size
2015-07-14 00:15:02 +00:00
Sanket Padawe
b11677635a
am 389fbb74
: am 2db9291e
: am 7995ca41
: Use same technology type for LTE/4G
...
* commit '389fbb748c577dd08ec8657a2ffa81c4e56ae5fa':
Use same technology type for LTE/4G
2015-07-14 00:15:01 +00:00
Chris Wren
95ac602959
am 209a72ca
: am b6d8b5f6
: am 2f8bb8ea
: Merge "import new view enums into MetricsLogger" into mnc-dev
...
* commit '209a72cab17a48b549484982817bb13513d96cd3':
import new view enums into MetricsLogger
2015-07-14 00:15:00 +00:00
Geoff Mendal
f1507ef3dd
am 1e9aca41
: (-s ours) am d8b05ce2
: (-s ours) am 536ed184
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '1e9aca417c87308cc95433fde1ed679b8ccff150':
Import translations. DO NOT MERGE
2015-07-14 00:14:59 +00:00
Zoltan Szatmary-Ban
0998e03a8d
am e4e52064
: am c968c407
: am 098c296d
: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
...
* commit 'e4e520641d7c0b2b173a830dcd7a5a2bcb767ebf':
Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 00:14:55 +00:00
Geoff Mendal
4c41536153
am ed45bc30
: (-s ours) am 92a33ff7
: (-s ours) am da15ade8
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ed45bc30708e6b4bbf828f5a23ec2d656b8e01da':
Import translations. DO NOT MERGE
2015-07-14 00:14:54 +00:00
Maurice Lam
49e0b9fdff
am a2511269
: am 39f92c0f
: am c6178ba0
: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit 'a2511269745c7d8ae101996d02905fbed3c5bfe7':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 23:50:34 +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
a251126974
am 39f92c0f
: am c6178ba0
: Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-dr-dev
...
* commit '39f92c0f54f40bacff42d24d02431ba6744cf2d5':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-13 22:48:25 +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
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