Commit Graph

7249 Commits

Author SHA1 Message Date
Sanket Padawe
e07fce2c3b am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '18c31082b397858564f1dc99a785dc77d1814151':
  Use common xml file for multi-tab settings.
2015-07-16 05:40:25 +00:00
Sanket Padawe
18c31082b3 am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit 'c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
  Use common xml file for multi-tab settings.
2015-07-16 05:27:44 +00:00
Sanket Padawe
046decca29 Merge "Use common xml file for multi-tab settings." into mnc-dev 2015-07-16 05:01:27 +00:00
Maurice Lam
037ec86847 am 85f199d8: am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '85f199d8620c689ae6f0ae94eeda9168fa93c2db':
  [Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:57:00 +00:00
Maurice Lam
85f199d862 am 021b3d95: am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit '021b3d955f91eeaa03f8f45401663954560dc748':
  [Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:43:11 +00:00
Maurice Lam
bec1d29558 Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev 2015-07-16 02:19:19 +00:00
Jason Monk
a4dfe05b29 am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
  Disable ignore battery optimization items that can't change
2015-07-15 23:30:21 +00:00
Jason Monk
5d780aa921 am f9d8deff: am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
  Change move storage from dropdown pref to dialog
2015-07-15 23:30:19 +00:00
Jason Monk
543d68cc3a am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
  Disable ignore battery optimization items that can't change
2015-07-15 23:20:43 +00:00
Jason Monk
f9d8deffaa am 7beb763d: am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '7beb763da239fb71f214cab0587ae52f383985fc':
  Change move storage from dropdown pref to dialog
2015-07-15 23:20:41 +00:00
Jason Monk
509726054a Merge "Disable ignore battery optimization items that can't change" into mnc-dev 2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559 Merge "Change move storage from dropdown pref to dialog" into mnc-dev 2015-07-15 22:48:06 +00:00
Maurice Lam
3603d8ad82 am 2ea2950d: am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '2ea2950d9c15e2da38d5aece8de7c0079539d99a':
  [Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:47:19 +00:00
Maurice Lam
2ea2950d9c am 77352c65: am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '77352c65be3d4106da93609794610d88347e069b':
  [Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:32:46 +00:00
Jason Monk
e8400c2fb7 Change move storage from dropdown pref to dialog
Use a horizontal pref and a single button that triggers the dialog

Bug: 21922660
Change-Id: Ifb4de75ca9269d2e8163eec5602932260adec0d9
2015-07-15 16:59:28 -04:00
Maurice Lam
4595978b72 Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev 2015-07-15 19:28:06 +00:00
Jason Monk
443513cc0d Disable ignore battery optimization items that can't change
Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
2015-07-15 15:22:38 -04:00
Maurice Lam
8d1f9c9be5 [Fingerprint] Add fingerprint enroll in setup wizard
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.

On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.

Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
2015-07-15 11:14:22 -07:00
Selim Cinek
854d08be2b Fixed the layout for the fingerprint renaming
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
(cherry picked from commit abd67de1ad)
2015-07-15 17:37:46 +00:00
Geoff Mendal
f3907176da Import translations. DO NOT MERGE
Change-Id: I0bd7d5fb307ffa5fd3b001eaf5cf7697168e90d6
Auto-generated-cl: translation import
2015-07-15 06:56:45 -07:00
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