Commit Graph

7279 Commits

Author SHA1 Message Date
xinhe
53d676791b am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '9d95d88442babaa3511d28d89e05a244b97a7bdf':
  Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:39:58 +00:00
xinhe
9d95d88442 am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '7e23bae6c6d8697c1f53ed4a3b8b467d3142fd76':
  Need to disable 5GHz bands for WiFi tethering in Japan
2015-07-14 23:26:08 +00:00
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
Billy Lau
bd5ae86579 am 254ce51b: 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 '254ce51b129a6b6a8f98b4641895ab085a3936c9':
  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 19:08:46 +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
Sanket Padawe
c06f9b6721 Use common xml file for multi-tab settings.
Bug: 22360525
Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
2015-07-14 11:13:43 -07: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
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
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
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
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
53dd1d4dee Merge "Fix app icon size" into mnc-dev 2015-07-13 18:05:54 +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
a0838470f3 Import translations. DO NOT MERGE
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
2015-07-13 06:53:26 -07: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
Rubin Xu
bd2e045e17 am a383b02c: am 8b9a9519: am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit 'a383b02c431de7b68f8f913ecfeca9f0051122fe':
  Remove unused MediaFormat activity
2015-07-10 19:26:09 +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
Rubin Xu
331b9823d0 Merge "Remove unused MediaFormat activity" into mnc-dev 2015-07-10 18:47:51 +00: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
e10b32ba41 am 1bde3259: am df778e8e: am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '1bde32596441375f41b9653eb22b22b3df915ebe':
  Talkback improvements for Settings screens.
2015-07-09 19:40:31 +00:00
Julia Reynolds
df778e8e76 am 963e3fdd: Merge "Talkback improvements for Settings screens." into mnc-dev
* commit '963e3fdd05156bb11e6692222b2d08b34c7d126b':
  Talkback improvements for Settings screens.
2015-07-09 19:09:25 +00:00
Julia Reynolds
963e3fdd05 Merge "Talkback improvements for Settings screens." into mnc-dev 2015-07-09 18:57:24 +00:00
Julia Reynolds
ce25af4838 Talkback improvements for Settings screens.
Bug: 21164141
Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
2015-07-09 13:21:20 -04:00
Selim Cinek
31e554acff am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev
* commit 'babeeacb58d0e24b752598de0383e082e6c76784':
  Fixed the layout for the fingerprint renaming
2015-07-08 23:37:50 +00:00
Selim Cinek
aab3a4c847 Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 2015-07-08 23:09:52 +00:00
Selim Cinek
abd67de1ad Fixed the layout for the fingerprint renaming
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
2015-07-08 15:47:56 -07:00
Amit Mahajan
e08a3512bb am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '0757812525349f31d921bc877886ece7d3a44c4d':
  Remove 'do not translate' comment for string 'None'.
2015-07-08 21:08:11 +00:00
Sanket Padawe
012876e400 am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit 'beb277de3c01ca1bfed1e22be682a3f79325a6bf':
  Locale based string changes in BT.
2015-07-08 21:08:09 +00:00
Amit Mahajan
2856c4fcbd am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
  Remove 'do not translate' comment for string 'None'.
2015-07-08 20:37:19 +00:00
Sanket Padawe
a63ee14f45 am c7777b94: Merge "Locale based string changes in BT." into mnc-dev
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
  Locale based string changes in BT.
2015-07-08 20:37:18 +00:00
Amit Mahajan
01ce80b574 Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev 2015-07-08 20:24:10 +00:00
Amit Mahajan
3cd87a2f70 Remove 'do not translate' comment for string 'None'.
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
2015-07-08 11:07:34 -07:00
Sanket Padawe
c7777b9470 Merge "Locale based string changes in BT." into mnc-dev 2015-07-08 17:15:57 +00:00
Geoff Mendal
5a416db19e Import translations. DO NOT MERGE
Change-Id: I442dee3b1b41104a76dc1293208010feb77dba7e
Auto-generated-cl: translation import
2015-07-08 08:19:19 -07:00
Sanket Padawe
aa165e0a50 Locale based string changes in BT.
Bug: 22219203
Change-Id: Ic920621baf769032475da32ea425097aafa0922e
2015-07-07 12:13:08 -07:00
Jorim Jaggi
21b0521195 am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit 'a03576049fb71b42829304a46740a2696a233e29':
  Text changes to assist & voice input
2015-07-06 21:33:39 +00:00
Jorim Jaggi
30001127b2 am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
* commit '2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
  Text changes to assist & voice input
2015-07-06 21:04:31 +00:00
Jorim Jaggi
2bd619d5ed Merge "Text changes to assist & voice input" into mnc-dev 2015-07-06 20:48:40 +00:00
Jeff Sharkey
084dd0487c am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit 'fc963764ab93bd2e6fce2a214f9cc992dbceda73':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
2015-07-06 19:02:18 +00:00