Commit Graph

21048 Commits

Author SHA1 Message Date
xinhe
7e23bae6c6 am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit 'd7fb46de591943c402dd13551ca603081ac4e6a7':
  Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:13:03 +00:00
xinhe
d7fb46de59 Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev 2015-07-14 22:29:32 +00:00
xinhe
cbdcca6cf6 Need to disable 5GHz bands for WiFi tethering in Japan
b/22396383

Change-Id: I99090f28eff1b232ebba89ff638e37be82a3f21b
2015-07-14 14:39:43 -07: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
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
Jason Monk
f05248f88f Fix Help menu for PrivateVolumeSettings
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.

Bug: 22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
2015-07-14 15:00:22 -04: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
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
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
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
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
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
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
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
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
Geoff Mendal
7174a3d701 Import translations. DO NOT MERGE
Change-Id: I73a807d112306b787b9975ee0c2560a2431f031b
Auto-generated-cl: translation import
2015-07-11 13:37:38 -05:00
Geoff Mendal
da15ade830 Import translations. DO NOT MERGE
Change-Id: Ib1f4051b1001de52b74483fc18eaf909e656de67
Auto-generated-cl: translation import
2015-07-11 06:59:16 -07: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
d3b6832edb am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '7ba46433aefad363a1d2e75d4a12f2886c6d0315':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:16:57 +00:00
Robin Lee
7ba46433ae Merge "Match getLegacyVpn calls to changed interface" into mnc-dev 2015-07-10 19:05:41 +00:00
Rubin Xu
8b9a9519c8 am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
  Remove unused MediaFormat activity
2015-07-10 19:03:19 +00:00
Jason Monk
c07450ae74 am 7ab3cf94: Merge "Fix wifi not re-ordering" into mnc-dev
* commit '7ab3cf944dd8c120555dada4fc490a9fe592f37e':
  Fix wifi not re-ordering
2015-07-10 18:48:32 +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