OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoMerge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:28 +0000 (12:25 +0000)]
Merge "Bump string char limit." into mnc-dev

8 years agoAdd contactless symbol to NFC resources.
Martijn Coenen [Wed, 29 Jul 2015 08:10:35 +0000 (10:10 +0200)]
Add contactless symbol to NFC resources.

Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431

8 years agoMerge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 07:54:04 +0000 (07:54 +0000)]
Merge "Fix tap & pay strings." into mnc-dev

8 years agoAdjustments for find sensor screen
Jorim Jaggi [Tue, 28 Jul 2015 23:55:00 +0000 (16:55 -0700)]
Adjustments for find sensor screen

Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170

8 years agoMerge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL...
Zach Johnson [Tue, 28 Jul 2015 22:36:31 +0000 (22:36 +0000)]
Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

8 years agoMerge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]
Merge "Prevent crash in app memory updater." into mnc-dev

8 years agoMerge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Hide usage graph on app usage details pages." into mnc-dev

8 years agoMerge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]
Merge "Make fingerprint error text a live region" into mnc-dev

8 years agoMerge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

8 years agoMerge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:49:43 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev

8 years agoPrevent crash in app memory updater.
Julia Reynolds [Tue, 28 Jul 2015 19:49:39 +0000 (15:49 -0400)]
Prevent crash in app memory updater.

Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d

8 years agoDon't use screenshot if structure is disabled (2/2)
Jorim Jaggi [Tue, 28 Jul 2015 00:48:02 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (2/2)

Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034

8 years agoBump string char limit.
Julia Reynolds [Tue, 28 Jul 2015 17:39:24 +0000 (13:39 -0400)]
Bump string char limit.

Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837

8 years ago[ZenMode] Align text to viewStart in remove dialog
Maurice Lam [Tue, 21 Jul 2015 18:36:43 +0000 (11:36 -0700)]
[ZenMode] Align text to viewStart in remove dialog

Bug: 22274462
Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40

8 years agofix InactiveApps instrumentation
Chris Wren [Tue, 28 Jul 2015 16:44:37 +0000 (12:44 -0400)]
fix InactiveApps instrumentation

Bug: 21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c

8 years agoCheck for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Mon, 18 May 2015 18:39:01 +0000 (11:39 -0700)]
Check for special char when renaming device for Wi-Fi direct.

Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef348c17a985eb51ef74469a32c3c938d)

8 years agoFix tap & pay strings.
Martijn Coenen [Mon, 27 Jul 2015 14:09:56 +0000 (16:09 +0200)]
Fix tap & pay strings.

Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7

8 years agoUse pattern visibility setting on confirm pattern screen.
Julia Reynolds [Tue, 28 Jul 2015 13:44:59 +0000 (09:44 -0400)]
Use pattern visibility setting on confirm pattern screen.

Bug: 22683055
Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3

8 years agoHide usage graph on app usage details pages.
Julia Reynolds [Mon, 27 Jul 2015 20:00:06 +0000 (16:00 -0400)]
Hide usage graph on app usage details pages.

Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560

8 years agoMake fingerprint error text a live region
Jorim Jaggi [Tue, 28 Jul 2015 00:59:05 +0000 (17:59 -0700)]
Make fingerprint error text a live region

Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d

8 years agoMerge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]
Merge "Adjust choose assist app string" into mnc-dev

8 years agoMerge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]
Merge "Fix blank confirm device credential activity" into mnc-dev

8 years agoAdjust enrollment UI for sw400 devices
Jorim Jaggi [Tue, 28 Jul 2015 00:31:23 +0000 (17:31 -0700)]
Adjust enrollment UI for sw400 devices

Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b

8 years agoAdjust choose assist app string
Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]
Adjust choose assist app string

Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f

8 years agoMerge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Autocapitalizing the fingerprint names now" into mnc-dev

8 years agoMerge "Added content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]
Merge "Added content description for the fingerprint icon" into mnc-dev

8 years agoMerge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:23 +0000 (20:57 +0000)]
Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

8 years agoAdded android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Mon, 27 Jul 2015 19:24:59 +0000 (12:24 -0700)]
Added android.permission.PEERS_MAC_ADDRESS permission

This permission is required for Settings to have access to BT/WiFi scan results
even if location is turned off.

Bug: 21852542
Bug: 22728628
Change-Id: I1b527f78077b45a326fd22d9b4ed92f9f806ff49

8 years agoMerge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 18:55:30 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

8 years agoFix blank confirm device credential activity
Jorim Jaggi [Fri, 24 Jul 2015 20:03:12 +0000 (13:03 -0700)]
Fix blank confirm device credential activity

Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.

Bug: 22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d

8 years agoMerge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]
Merge "Battery summary - tint uid 0 icon" into mnc-dev

8 years agoMerge "Update battery optimization strings" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 17:39:54 +0000 (17:39 +0000)]
Merge "Update battery optimization strings" into mnc-dev

8 years agoMerge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
Sanket Padawe [Mon, 27 Jul 2015 17:31:42 +0000 (17:31 +0000)]
Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

8 years agoBattery summary - tint uid 0 icon
Jason Monk [Mon, 27 Jul 2015 17:03:42 +0000 (13:03 -0400)]
Battery summary - tint uid 0 icon

Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b

8 years agoUpdate battery optimization strings
Jason Monk [Mon, 27 Jul 2015 15:23:15 +0000 (11:23 -0400)]
Update battery optimization strings

Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa

8 years agoHandle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 15:13:25 +0000 (11:13 -0400)]
Handle app uninstall via Storage & USB.

Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 23:56:10 +0000 (16:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic8304c3f1eb5a71815f72d71854fdcabca7204b8
Auto-generated-cl: translation import

8 years agoAutocapitalizing the fingerprint names now
Selim Cinek [Fri, 24 Jul 2015 23:50:16 +0000 (16:50 -0700)]
Autocapitalizing the fingerprint names now

Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86

8 years agoHide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
Zach Johnson [Fri, 24 Jul 2015 21:56:30 +0000 (14:56 -0700)]
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED

Once they are enabled for the first time, they'll show up indefinitely.

b/22667081

Change-Id: Ia28de99d7d638d54c15fac2e08edeb70a9657e23

8 years agoAdded content description for the fingerprint icon
Selim Cinek [Thu, 23 Jul 2015 22:05:38 +0000 (15:05 -0700)]
Added content description for the fingerprint icon

Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804

8 years agoUpdate FRP warning to spec
Adrian Roos [Fri, 24 Jul 2015 18:30:14 +0000 (11:30 -0700)]
Update FRP warning to spec

Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227

8 years agoFix issues in AP dialog arising after clicking on AP preferences.
Sanket Padawe [Fri, 24 Jul 2015 20:52:03 +0000 (13:52 -0700)]
Fix issues in AP dialog arising after clicking on AP preferences.

+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7

8 years agoMerge "[Fingerprint] Show skip button during SUW" into mnc-dev
Maurice Lam [Fri, 24 Jul 2015 03:08:29 +0000 (03:08 +0000)]
Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 01:10:24 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import

8 years agoAdapted a string in the fingerprint enrollment flow
Selim Cinek [Thu, 23 Jul 2015 21:46:44 +0000 (14:46 -0700)]
Adapted a string in the fingerprint enrollment flow

Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376

8 years agoMerge "Reset permissions and app links when clearing app preferences - settings"...
Svetoslav Ganov [Thu, 23 Jul 2015 21:47:10 +0000 (21:47 +0000)]
Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

8 years agoMerge "Fix battery detail issues with "Android OS"" into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:23:57 +0000 (20:23 +0000)]
Merge "Fix battery detail issues with "Android OS"" into mnc-dev

8 years agoMerge "Don't show disabled apps in ignore optimizations" into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:23:09 +0000 (20:23 +0000)]
Merge "Don't show disabled apps in ignore optimizations" into mnc-dev

8 years agoPrevent monkey from changing adoptable storage settings
Guang Zhu [Thu, 23 Jul 2015 17:47:40 +0000 (10:47 -0700)]
Prevent monkey from changing adoptable storage settings

Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b

8 years agoMerge "Add or remove WFC setting when Wireless settings activity is resumed" into...
Pavel Zhamaitsiak [Thu, 23 Jul 2015 16:54:55 +0000 (16:54 +0000)]
Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

8 years agoReset permissions and app links when clearing app preferences - settings
Svet Ganov [Thu, 23 Jul 2015 16:40:13 +0000 (09:40 -0700)]
Reset permissions and app links when clearing app preferences - settings

bug:22359132

Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0

8 years agoAdd or remove WFC setting when Wireless settings activity is resumed
Pavel Zhamaitsiak [Thu, 23 Jul 2015 16:31:58 +0000 (09:31 -0700)]
Add or remove WFC setting when Wireless settings activity is resumed

WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.

Bug: 22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458

8 years ago[Fingerprint] Show skip button during SUW
Maurice Lam [Wed, 22 Jul 2015 23:03:32 +0000 (16:03 -0700)]
[Fingerprint] Show skip button during SUW

Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.

Bug: 22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1

8 years agoMerge "Remove tuner from development settings" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge "Remove tuner from development settings" into mnc-dev

8 years agoFix battery detail issues with "Android OS"
Jason Monk [Wed, 22 Jul 2015 14:12:05 +0000 (10:12 -0400)]
Fix battery detail issues with "Android OS"

Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29

8 years agoMerge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)]
Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev

8 years agoMerge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:39:35 +0000 (23:39 +0000)]
Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev

8 years agoMerge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:38:34 +0000 (23:38 +0000)]
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev

8 years agoMove PIN/Pattern appear animation to RenderThread (2/2)
Jorim Jaggi [Tue, 21 Jul 2015 22:34:26 +0000 (15:34 -0700)]
Move PIN/Pattern appear animation to RenderThread (2/2)

Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9

8 years ago[Fingerprint] Send RESULT_CANCELED when back from Add another
Maurice Lam [Fri, 17 Jul 2015 20:16:40 +0000 (13:16 -0700)]
[Fingerprint] Send RESULT_CANCELED when back from Add another

Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.

This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
  FingerprintEnrollFinish. If the user clicks back in
  FingerprintEnrollEnrolling, they will always go back to the
  previous screen with RESULT_CANCELED, which would either be
  FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
  possible outside of Setup Wizard, they will be back in Find Sensor,
  and pressing next will enroll an additional fingerprint.
  - Edge case: if the user enrolled the maximum number of
    fingerprints, and presses back, they will be bounced all the way
    back to Settings > Security.

Bug: 22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d

8 years agoMerge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into...
Billy Lau [Tue, 21 Jul 2015 17:37:05 +0000 (17:37 +0000)]
Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev

8 years agoMerge "Fix bug to force to close once change Bearer on APN" into mnc-dev
Amit Mahajan [Tue, 21 Jul 2015 16:57:12 +0000 (16:57 +0000)]
Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev

8 years agoBug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 15:43:17 +0000 (16:43 +0100)]
Bug 21589105 Rescope WRITE_SETTINGS (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 needing this capability can
launch the summary UX through a specific intent.

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

strings.xml:
Increased the CHAR limits for some strings due to requests from translators.

Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63

8 years agoMake 'fingerprint' searchable in Settings.
Julia Reynolds [Thu, 16 Jul 2015 19:33:22 +0000 (15:33 -0400)]
Make 'fingerprint' searchable in Settings.

Bug: 22511754
Change-Id: I1e145ca9a33eb336014a8a4e158e9196a91cfdcc

8 years agoDon't show disabled apps in ignore optimizations
Jason Monk [Tue, 21 Jul 2015 13:30:18 +0000 (09:30 -0400)]
Don't show disabled apps in ignore optimizations

Bug: 22612760
Change-Id: Iddb3ad9cb9403d9e51bfcda82db3d10ee34ca47d

8 years ago[ScreenLock] Style encryption interstitial in SUW
Maurice Lam [Mon, 20 Jul 2015 23:08:38 +0000 (16:08 -0700)]
[ScreenLock] Style encryption interstitial in SUW

When running in setup wizard, style the encryption interstitial using
styles from Setup Wizard library, to be consistent with the rest of
the setup flow.

Bug: 22587892
Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b

8 years agoMerge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:38:38 +0000 (00:38 +0000)]
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

8 years agoMerge "[Fingerprint] Change message in encryption" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:22:34 +0000 (00:22 +0000)]
Merge "[Fingerprint] Change message in encryption" into mnc-dev

8 years agoMerge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 00:22:02 +0000 (00:22 +0000)]
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev

8 years agoFix bug to force to close once change Bearer on APN
Sungmin Choi [Mon, 20 Jul 2015 21:08:12 +0000 (14:08 -0700)]
Fix bug to force to close once change Bearer on APN

Bug: 22544257
Change-Id: I43eea4034c3d106b8e3f8e4f999f389db04b7567

8 years ago[ScreenLock] Change title for RedactionInterstitial
Maurice Lam [Mon, 20 Jul 2015 22:35:21 +0000 (15:35 -0700)]
[ScreenLock] Change title for RedactionInterstitial

Change the title for RedactionInterstital to "Notifications".

Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4

8 years ago[ScreenLock] Update illustration during setup wizard
Maurice Lam [Mon, 20 Jul 2015 23:39:39 +0000 (16:39 -0700)]
[ScreenLock] Update illustration during setup wizard

Update the illustration to a new version which changes the "screen"
illustrated in the device.

Bug: 22587892
Change-Id: Ic52e28eb40b965b49fa4f2f220284cd2768470d5

8 years agoMerge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev
Jim Miller [Mon, 20 Jul 2015 22:50:29 +0000 (22:50 +0000)]
Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev

8 years agoDon't launch ConfirmDeviceCredentials multiple times.
Jim Miller [Mon, 20 Jul 2015 22:36:21 +0000 (15:36 -0700)]
Don't launch ConfirmDeviceCredentials multiple times.

Fixes bug 18724944

Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Jul 2015 22:33:59 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1a4e18120641388458b5f90a531978292f307bc6
Auto-generated-cl: translation import

8 years ago[ScreenLock] Change title of encryption interstitial
Maurice Lam [Mon, 20 Jul 2015 22:03:37 +0000 (15:03 -0700)]
[ScreenLock] Change title of encryption interstitial

Change the title of EncryptionInterstitial to "Secure start-up".

Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51

8 years ago[Fingerprint] Change message in encryption
Maurice Lam [Mon, 20 Jul 2015 21:49:29 +0000 (14:49 -0700)]
[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

8 years agoMerge "Fix ugly text wrapping on non-english locales" into mnc-dev
Makoto Onuki [Mon, 20 Jul 2015 20:35:07 +0000 (20:35 +0000)]
Merge "Fix ugly text wrapping on non-english locales" into mnc-dev

8 years agoMerge "Handle monkey crash" into mnc-dev
Jason Monk [Mon, 20 Jul 2015 20:32:28 +0000 (20:32 +0000)]
Merge "Handle monkey crash" into mnc-dev

8 years agoHandle monkey crash
Jason Monk [Mon, 20 Jul 2015 17:40:40 +0000 (13:40 -0400)]
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

8 years agoMerge "Offer 'ask' as an available app-linking state" into mnc-dev
Christopher Tate [Mon, 20 Jul 2015 17:06:26 +0000 (17:06 +0000)]
Merge "Offer 'ask' as an available app-linking state" into mnc-dev

8 years agoOffer 'ask' as an available app-linking state
Christopher Tate [Fri, 17 Jul 2015 20:15:12 +0000 (13:15 -0700)]
Offer 'ask' as an available app-linking state

Bug 22532193

Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99

8 years agoMerge "Simplify FingerprintSettings" into mnc-dev
Jim Miller [Fri, 17 Jul 2015 21:05:06 +0000 (21:05 +0000)]
Merge "Simplify FingerprintSettings" into mnc-dev

8 years agoSimplify FingerprintSettings
Jim Miller [Fri, 17 Jul 2015 00:20:17 +0000 (17:20 -0700)]
Simplify FingerprintSettings

There's no need for FingerprintSettings to retry fingerprint
any more often than these cases: 1. authentication success,
2. authentication error and 3. when the activity resumes.

Fixes bug 22438498

Change-Id: I87841e9916cfc9e6c64cd1df009b9a9c765f87d0

8 years agoMerge "Remove blank switchtext from switch preferences." into mnc-dev
Julia Reynolds [Fri, 17 Jul 2015 20:11:25 +0000 (20:11 +0000)]
Merge "Remove blank switchtext from switch preferences." into mnc-dev

8 years agoMerge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..."...
Billy Lau [Fri, 17 Jul 2015 18:28:27 +0000 (18:28 +0000)]
Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev

8 years agoBug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
Billy Lau [Thu, 16 Jul 2015 02:50:47 +0000 (03:50 +0100)]
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

8 years agoIntent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Thu, 16 Jul 2015 23:00:49 +0000 (16:00 -0700)]
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

Bug 22504009

Change-Id: I19ded70cf17936504a2a1becea2684d87952dff6

8 years agoFix ugly text wrapping on non-english locales
Makoto Onuki [Thu, 16 Jul 2015 22:43:47 +0000 (15:43 -0700)]
Fix ugly text wrapping on non-english locales

Bug 22284618

Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495

8 years agoRemove tuner from development settings
Jason Monk [Thu, 16 Jul 2015 20:41:15 +0000 (16:41 -0400)]
Remove tuner from development settings

It has a new home now.

Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78

8 years agoRemove blank switchtext from switch preferences.
Julia Reynolds [Wed, 15 Jul 2015 15:08:11 +0000 (11:08 -0400)]
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

8 years agoMerge "Show disabled trust agents as off." into mnc-dev
Kenny Guy [Thu, 16 Jul 2015 12:42:39 +0000 (12:42 +0000)]
Merge "Show disabled trust agents as off." into mnc-dev

8 years agoMerge "Use common xml file for multi-tab settings." into mnc-dev
Sanket Padawe [Thu, 16 Jul 2015 05:01:06 +0000 (05:01 +0000)]
Merge "Use common xml file for multi-tab settings." into mnc-dev

8 years agoMerge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
Maurice Lam [Thu, 16 Jul 2015 02:19:18 +0000 (02:19 +0000)]
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev

8 years agoMerge "Disable ignore battery optimization items that can't change" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 22:48:12 +0000 (22:48 +0000)]
Merge "Disable ignore battery optimization items that can't change" into mnc-dev

8 years agoMerge "Change move storage from dropdown pref to dialog" into mnc-dev
Jason Monk [Wed, 15 Jul 2015 22:48:05 +0000 (22:48 +0000)]
Merge "Change move storage from dropdown pref to dialog" into mnc-dev

8 years agoChange move storage from dropdown pref to dialog
Jason Monk [Wed, 15 Jul 2015 17:04:59 +0000 (13:04 -0400)]
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

8 years agoMerge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
Maurice Lam [Wed, 15 Jul 2015 19:28:05 +0000 (19:28 +0000)]
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev

8 years agoDisable ignore battery optimization items that can't change
Jason Monk [Wed, 15 Jul 2015 19:22:38 +0000 (15:22 -0400)]
Disable ignore battery optimization items that can't change

Bug: 22507803
Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12

8 years agoMerge "Fixed the layout for the fingerprint renaming" into mnc-dev
Jim Miller [Wed, 15 Jul 2015 19:18:05 +0000 (19:18 +0000)]
Merge "Fixed the layout for the fingerprint renaming" into mnc-dev