Commit Graph

7224 Commits

Author SHA1 Message Date
Maurice Lam
c0e7879684 [Fingerprint] Change message in encryption
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.

Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
2015-07-20 21:52:12 +00:00
Makoto Onuki
9e95d6ce9f am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
* commit '4dd637a07e7eba9341d85c21fbb1fccac7e685c3':
  Fix ugly text wrapping on non-english locales
2015-07-20 20:45:36 +00:00
Jason Monk
cb4b45cc30 am 178c4099: Merge "Handle monkey crash" into mnc-dev
* commit '178c40998df2d5196bc5913fca831880cfa47c50':
  Handle monkey crash
2015-07-20 20:45:33 +00:00
Makoto Onuki
4dd637a07e Merge "Fix ugly text wrapping on non-english locales" into mnc-dev 2015-07-20 20:35:09 +00:00
Jason Monk
178c40998d Merge "Handle monkey crash" into mnc-dev 2015-07-20 20:32:29 +00:00
Jason Monk
bd45c3cbe0 Handle monkey crash
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.

Bug: 22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
2015-07-20 13:40:40 -04:00
Christopher Tate
55073e0954 am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
* commit 'b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
  Offer 'ask' as an available app-linking state
2015-07-20 17:25:17 +00:00
Christopher Tate
b852fcbde9 Merge "Offer 'ask' as an available app-linking state" into mnc-dev 2015-07-20 17:06:27 +00:00
Christopher Tate
2eda36509f Offer 'ask' as an available app-linking state
Bug 22532193

Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
2015-07-17 16:11:41 -07:00
Julia Reynolds
75b901c336 am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
* commit '0c03b50a02007499208603733e597f72aa9a59c2':
  Remove blank switchtext from switch preferences.
2015-07-17 20:25:56 +00:00
Julia Reynolds
0c03b50a02 Merge "Remove blank switchtext from switch preferences." into mnc-dev 2015-07-17 20:11:27 +00:00
Billy Lau
262b64e7a9 am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
* commit '90a8a01b629694d28dd7e40a8f0253894fc14e02':
  Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 18:39:18 +00:00
Billy Lau
f8f9802104 Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Overall, fixed the detection of the state of permission in the corresponding UX
to be more accurate. Also ensured that apps can actually launch the summary UX
through a custom intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.

Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
2015-07-17 18:23:57 +01:00
Makoto Onuki
26cf58aba6 Fix ugly text wrapping on non-english locales
Bug 22284618

Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
2015-07-16 15:45:09 -07:00
Jason Monk
b1d9536e58 Remove tuner from development settings
It has a new home now.

Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
2015-07-16 16:41:15 -04:00
Julia Reynolds
16eec50576 Remove blank switchtext from switch preferences.
This makes TTS services read the default text (on/off) when
these switches are toggled.

Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Sanket Padawe
bee718b7b1 am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '046decca29376aba5b97b78900bfd867ca3f310c':
  Use common xml file for multi-tab settings.
2015-07-16 05:13:53 +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
d4fa7aa48c am bec1d295: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
* commit 'bec1d295586b752f81f523c8339dcd49c586d722':
  [Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:27:58 +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
94b7585895 am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
* commit '509726054a3efc09d65d6c15f485ea6f1da2d272':
  Disable ignore battery optimization items that can't change
2015-07-15 23:01:53 +00:00
Jason Monk
5fa374cc20 am 4a6b9095: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
* commit '4a6b909559d50e02833afd5119876df070dfd458':
  Change move storage from dropdown pref to dialog
2015-07-15 23:01:51 +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
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
58a6af1496 am 4595978b: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
  [Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 19:38:05 +00:00
Jim Miller
2a414b9368 am 6b9d7889: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
  Fixed the layout for the fingerprint renaming
2015-07-15 19:30:55 +00: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
e9c822b0c6 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 22:40:35 +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
45b27c3a04 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:37:09 +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
90d21f0967 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
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
34e7b4cd05 am 53dd1d4d: Merge "Fix app icon size" into mnc-dev
* commit '53dd1d4deea9968f1255018248ff0393252032dd':
  Fix app icon size
2015-07-13 18:12:35 +00: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
a0838470f3 Import translations. DO NOT MERGE
Change-Id: Ice9d7f5cfe191a669657298432c0ecfae0f438bb
Auto-generated-cl: translation import
2015-07-13 06:53:26 -07: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
20eb7e10f2 am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev
* commit '331b9823d0a686d414f181ed406181d1d4e2aa1a':
  Remove unused MediaFormat activity
2015-07-10 19:03:18 +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