OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam f61ead7a: Make sure accessibility service desc isn\'t clickable
Jason Monk [Tue, 4 Aug 2015 13:55:14 +0000 (13:55 +0000)]
am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
  Make sure accessibility service desc isn't clickable

8 years agoMake sure accessibility service desc isn't clickable
Jason Monk [Tue, 4 Aug 2015 13:44:10 +0000 (09:44 -0400)]
Make sure accessibility service desc isn't clickable

Bug: 21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9

8 years agoam f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in...
Dianne Hackborn [Tue, 4 Aug 2015 03:10:35 +0000 (03:10 +0000)]
am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs

8 years agoam 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into...
Chris Tate [Tue, 4 Aug 2015 03:10:34 +0000 (03:10 +0000)]
am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev

* commit '6e64e22ec72ac3adfb530f57925e1d4fe1c332dc':
  Explain properly when apps can open multiple hosts' links

8 years agoam eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into...
Prem Kumar [Tue, 4 Aug 2015 03:10:26 +0000 (03:10 +0000)]
am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev

* commit 'eed361bbafc079adb2a33eccee2f0a71d872ad54':
  Allow Contact sharing by default while connecting Car Kit.

8 years agoam 87fadbe6: [Fingerprint] Help text for backup screen lock
Maurice Lam [Tue, 4 Aug 2015 03:10:07 +0000 (03:10 +0000)]
am 87fadbe6: [Fingerprint] Help text for backup screen lock

* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
  [Fingerprint] Help text for backup screen lock

8 years agoam c493f042: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 4 Aug 2015 03:09:17 +0000 (03:09 +0000)]
am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit 'c493f0421773fba528494d98e396c34f6815fe7b':
  Import translations. DO NOT MERGE

8 years agoMerge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into...
Dianne Hackborn [Tue, 4 Aug 2015 01:07:36 +0000 (01:07 +0000)]
Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

8 years agoMerge "Explain properly when apps can open multiple hosts' links" into mnc-dev
Chris Tate [Tue, 4 Aug 2015 00:56:24 +0000 (00:56 +0000)]
Merge "Explain properly when apps can open multiple hosts' links" into mnc-dev

8 years agoExplain properly when apps can open multiple hosts' links
Christopher Tate [Tue, 4 Aug 2015 00:46:30 +0000 (17:46 -0700)]
Explain properly when apps can open multiple hosts' links

The app link settings "Open by default" detail view was showing
only one host under label "Supported links," improperly implying
that the app would only open that host's links.  The summary now
matches the 'App links' view's, explaining "Open $HOST and related
URLs" for apps with more than one.

Tapping on the item has always shown the full list of hosts
advertised by the app, and this remains unchanged.

Bug 22769535

Change-Id: I2be409df64639eb0f2b43a06e3195796c3a3df8b

8 years agoMerge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
Prem Kumar [Tue, 4 Aug 2015 00:41:47 +0000 (00:41 +0000)]
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev

8 years agoFix issue #22860466: viapi security bug - rubber stamping in nested VIs
Dianne Hackborn [Tue, 4 Aug 2015 00:17:10 +0000 (17:17 -0700)]
Fix issue #22860466: viapi security bug - rubber stamping in nested VIs

The settings activities that get launched directly by voice now
protect themselves to only execute if they were actually directly
launched by the voice interaction service, rather than allowing
any activity currently under voice control to abuse them.

Note the original code also allowed them to execute regardless of
whether they were running under voice, since it allowed for a null
saved state.  I assume that was a mistake, so have removed it.

Change-Id: Ib2269a7ee13016d300afba7fa257bfaca8990fab

8 years ago[Fingerprint] Help text for backup screen lock
Maurice Lam [Mon, 3 Aug 2015 22:33:25 +0000 (15:33 -0700)]
[Fingerprint] Help text for backup screen lock

Show a help text saying "Choose your backup screen lock method" when
asking the user for backup screen lock during fingerprint enrollment.

A backup translation is specified, using the source string "Set up your
backup screen lock method".

Bug: 22879473
Change-Id: I9b9348141227103e695d1fc78601745cac0309a7

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Aug 2015 22:15:10 +0000 (15:15 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22847296
Bug: 22816816
Bug: 22644642
Change-Id: Ieddb5bbb9f597eda153f307b62086753dd460e93

8 years agoam b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
Vinit Deshpande [Sat, 1 Aug 2015 00:35:01 +0000 (00:35 +0000)]
am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev

* commit 'b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
  wifi: Check for the sizeof ssid to start SoftAP

8 years agoMerge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
Vinit Deshpande [Sat, 1 Aug 2015 00:26:01 +0000 (00:26 +0000)]
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev

8 years agoAllow Contact sharing by default while connecting Car Kit.
Sanket Padawe [Sat, 1 Aug 2015 00:22:45 +0000 (17:22 -0700)]
Allow Contact sharing by default while connecting Car Kit.

Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030

8 years agowifi: Check for the sizeof ssid to start SoftAP
Sunil Dutt [Thu, 2 Jul 2015 09:58:58 +0000 (15:28 +0530)]
wifi: Check for the sizeof ssid to start SoftAP

Disable the option to start SoftAP if ssid byte length is over 32 bytes.

Bug: 22074821

Change-Id: I696dca1aac8673bff168481fde4b013450bac72c

8 years agoam efaa19d9: Fix fingerprint enrolling bug.
Jim Miller [Fri, 31 Jul 2015 23:49:08 +0000 (23:49 +0000)]
am efaa19d9: Fix fingerprint enrolling bug.

* commit 'efaa19d97d4aba1897357971af4c0991af71dbbd':
  Fix fingerprint enrolling bug.

8 years agoFix fingerprint enrolling bug.
Jim Miller [Fri, 31 Jul 2015 21:05:25 +0000 (14:05 -0700)]
Fix fingerprint enrolling bug.

This fixes a bug where rotating the device would call post_enroll()
too early, thus invalidating the current session.

Fixes bug 22708390

Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011

8 years agoam 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 19:02:30 +0000 (19:02 +0000)]
am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev

* commit '88832a3d4d48b94a3c43a6240dff75b5d486681b':
  [Fingerprint] Disable back in setup enrolling screen

8 years agoMerge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 18:50:39 +0000 (18:50 +0000)]
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev

8 years agoam 13cbe053: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 31 Jul 2015 16:51:42 +0000 (16:51 +0000)]
am 13cbe053: (-s ours) Import translations. DO NOT MERGE

* commit '13cbe05387fe387c88f39f9121a8283121e96bdc':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 31 Jul 2015 16:34:46 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011

8 years agoam c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
Jeff Sharkey [Fri, 31 Jul 2015 01:51:23 +0000 (01:51 +0000)]
am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev

* commit 'c7e59e52b45b66de74597a455023dd9fe4e07b3b':
  Let Settings measure transient free space.

8 years agoMerge "Let Settings measure transient free space." into mnc-dev
Jeff Sharkey [Fri, 31 Jul 2015 01:46:44 +0000 (01:46 +0000)]
Merge "Let Settings measure transient free space." into mnc-dev

8 years agoLet Settings measure transient free space.
Jeff Sharkey [Thu, 30 Jul 2015 23:55:42 +0000 (16:55 -0700)]
Let Settings measure transient free space.

Transient volumes like USB drives are only mounted at /mnt/media_rw,
but they still appear in Settings > Storage.  To show stats like
free/used space, give Settings the permissions it needs to access
devices mounted there.

Bug: 22545248
Change-Id: I50be38f02f7d2bfe51d1ac0f76a04c340a21f936

8 years agoam 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 00:49:57 +0000 (00:49 +0000)]
am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
  [Fingerprint] Advertise wake & unlock during SUW

8 years agoMerge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 00:43:58 +0000 (00:43 +0000)]
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

8 years ago[Fingerprint] Advertise wake & unlock during SUW
Maurice Lam [Thu, 30 Jul 2015 22:07:58 +0000 (15:07 -0700)]
[Fingerprint] Advertise wake & unlock during SUW

Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.

Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257

9 years agoam 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 23:10:55 +0000 (23:10 +0000)]
am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE

* commit '6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 22:54:40 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1

9 years agoam c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Fyodor Kupolov [Thu, 30 Jul 2015 20:54:23 +0000 (20:54 +0000)]
am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit 'c3067882dbf00e424cd146181cf15f33ecb9f8f8':
  Added android.permission.PEERS_MAC_ADDRESS permission

9 years agoMerge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Fyodor Kupolov [Thu, 30 Jul 2015 20:50:03 +0000 (20:50 +0000)]
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

9 years ago[Fingerprint] Disable back in setup enrolling screen
Maurice Lam [Thu, 30 Jul 2015 20:29:20 +0000 (13:29 -0700)]
[Fingerprint] Disable back in setup enrolling screen

Disable the back button because the back stack behavior is confusing.
Instead of going back to the screen the user previously saw, pressing
back in enrolling screen goes back to FindSensor.

Bug: 22848016
Change-Id: I71852eb1974f1542fb519bf8bbfdce12de62e66b

9 years agoam 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
Jorim Jaggi [Thu, 30 Jul 2015 20:22:21 +0000 (20:22 +0000)]
am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev

* commit '92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
  Add dialog to confirm last fingerprint removal

9 years agoMerge "Add dialog to confirm last fingerprint removal" into mnc-dev
Jorim Jaggi [Thu, 30 Jul 2015 20:16:08 +0000 (20:16 +0000)]
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev

9 years agoAdd dialog to confirm last fingerprint removal
Jorim Jaggi [Thu, 30 Jul 2015 19:41:42 +0000 (12:41 -0700)]
Add dialog to confirm last fingerprint removal

Bug: 22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa

9 years agoam bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 19:31:34 +0000 (19:31 +0000)]
am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

* commit 'bb9d6b906e564c9f685834bb7dcccfbe0aa87a29':
  Refresh after clearing, tweak warn threshold.

9 years agoMerge "Refresh after clearing, tweak warn threshold." into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 19:24:53 +0000 (19:24 +0000)]
Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

9 years agoRefresh after clearing, tweak warn threshold.
Jeff Sharkey [Thu, 30 Jul 2015 18:30:13 +0000 (11:30 -0700)]
Refresh after clearing, tweak warn threshold.

Refresh UI after clearing cache.  Hide user header on single-user
devices to match UX spec.  Refine adopted storage warning threshold
based on experiments with various devices.

For example, a typical internal storage device runs the benchmark
in about 600ms.  Very fast SD cards take about 1700ms, moderate speed
SD cards take about 3800ms, and slow SD cards take about 6800ms.

Bug: 2234590222487370
Change-Id: I6066f3b78dbb32277ae94b79e325500724f83c7e

9 years agoam eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direc...
Billy Lau [Thu, 30 Jul 2015 17:22:37 +0000 (17:22 +0000)]
am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev

* commit 'eb372c93ee00fa9365206129136501497e6341c7':
  Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one

9 years agoam 19128bd1: Extend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 17:22:06 +0000 (17:22 +0000)]
am 19128bd1: Extend char limit by small amount

* commit '19128bd1679cfcad3e38a447dd4584fa5280920f':
  Extend char limit by small amount

9 years agoMerge "Bug: 22718745 Intents to 'draw over other apps' should go direct to the packag...
Billy Lau [Thu, 30 Jul 2015 17:14:17 +0000 (17:14 +0000)]
Merge "Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one" into mnc-dev

9 years agoExtend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 15:05:09 +0000 (11:05 -0400)]
Extend char limit by small amount

Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23

9 years agoam 597d75ea: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 12:44:52 +0000 (12:44 +0000)]
am 597d75ea: (-s ours) Import translations. DO NOT MERGE

* commit '597d75eaad03047d0f55c49ce9c0d788f5a72a72':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 12:35:46 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 53f771d8: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 22:47:21 +0000 (22:47 +0000)]
am 53f771d8: (-s ours) Import translations. DO NOT MERGE

* commit '53f771d8218c553248d0954fba2f25b4257838b2':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 22:31:28 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 22:14:28 +0000 (22:14 +0000)]
am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
  Adjustments for find sensor screen

9 years agoBug: 22718745 Intents to 'draw over other apps' should go direct to the package's
Billy Lau [Mon, 27 Jul 2015 11:57:07 +0000 (12:57 +0100)]
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's
page instead of the top level one

Settings:
Added two activities to handle app-specific Intent when app invoke permission
management UI.

SettingsActivity:
Added two fragment classes to handle app-specific Intent when app invoke permission
management UI.

AndroidManifest.xml:
We handle both Intent to top level settings and app-specific management UI for
app ops protected permissions.

AppStateAppOpsBridge:
Added a new field to PermissionState to keep track of permission declared vs one
that is actually granted during install time.

AppState{Overlay/Usage/WriteSettings}Bridge:
Updated the fields affected by changes in PermissionState.

{DrawOverlay/UsageAccess/WriteSettings}Details:
Disabled the toggling of permission if the app did not declare for the asked
permission.

Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557

9 years agoMerge "Adjustments for find sensor screen" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 21:58:43 +0000 (21:58 +0000)]
Merge "Adjustments for find sensor screen" into mnc-dev

9 years agoam 2731a18f: Merge "brightness status not refresh in powercontrol widget"
Fyodor Kupolov [Wed, 29 Jul 2015 19:58:24 +0000 (19:58 +0000)]
am 2731a18f: Merge "brightness status not refresh in powercontrol widget"

* commit '2731a18fbe26eed89d870bf70a116a3588d227e1':
  brightness status not refresh in powercontrol widget

9 years agoMerge "brightness status not refresh in powercontrol widget"
Fyodor Kupolov [Wed, 29 Jul 2015 19:27:15 +0000 (19:27 +0000)]
Merge "brightness status not refresh in powercontrol widget"

9 years agoam 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 18:39:09 +0000 (18:39 +0000)]
am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
  [ZenMode] Align text to viewStart in remove dialog

9 years agoMerge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 18:25:48 +0000 (18:25 +0000)]
Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

9 years agoam 00b5488c: Merge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:43:28 +0000 (17:43 +0000)]
am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
  Change assist app warning message text

9 years agoam ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:43:27 +0000 (17:43 +0000)]
am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
  Change 'data' label to 'data usage'.

9 years agoMerge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:26:12 +0000 (17:26 +0000)]
Merge "Change assist app warning message text" into mnc-dev

9 years agoMerge "Change 'data' label to 'data usage'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:25:41 +0000 (17:25 +0000)]
Merge "Change 'data' label to 'data usage'." into mnc-dev

9 years agoChange 'data' label to 'data usage'.
Julia Reynolds [Wed, 29 Jul 2015 17:15:14 +0000 (13:15 -0400)]
Change 'data' label to 'data usage'.

Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c

9 years agoChange assist app warning message text
Julia Reynolds [Wed, 29 Jul 2015 17:01:10 +0000 (13:01 -0400)]
Change assist app warning message text

Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555

9 years agoam 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
Chris Wren [Wed, 29 Jul 2015 15:18:26 +0000 (15:18 +0000)]
am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
  fix InactiveApps instrumentation

9 years agoMerge "fix InactiveApps instrumentation" into mnc-dev
Chris Wren [Wed, 29 Jul 2015 14:57:14 +0000 (14:57 +0000)]
Merge "fix InactiveApps instrumentation" into mnc-dev

9 years agoam edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 14:17:43 +0000 (14:17 +0000)]
am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
  Add contactless symbol to NFC resources.

9 years agoMerge "Add contactless symbol to NFC resources." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 13:21:40 +0000 (13:21 +0000)]
Merge "Add contactless symbol to NFC resources." into mnc-dev

9 years agoam 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into...
Julia Reynolds [Wed, 29 Jul 2015 12:38:25 +0000 (12:38 +0000)]
am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit '300d6fd90c3b63948d86e140353604baa8339a34':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:38:24 +0000 (12:38 +0000)]
am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
  Bump string char limit.

9 years agoMerge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:54 +0000 (12:25 +0000)]
Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

9 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

9 years agoam 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 08:12:07 +0000 (08:12 +0000)]
am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.

9 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

9 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

9 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

9 years agoam a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_D...
Zach Johnson [Tue, 28 Jul 2015 22:57:57 +0000 (22:57 +0000)]
am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

* commit 'a425e86478b60c4eb1f90f47197fa244379879de':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED

9 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

9 years agoam 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:52:50 +0000 (20:52 +0000)]
am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
  Prevent crash in app memory updater.

9 years agoam feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:52:48 +0000 (20:52 +0000)]
am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
  Hide usage graph on app usage details pages.

9 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

9 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

9 years agoam 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:46 +0000 (20:08 +0000)]
am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
  Make fingerprint error text a live region

9 years agoam 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:44 +0000 (20:08 +0000)]
am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
  Adjust enrollment UI for sw400 devices

9 years agoam 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:43 +0000 (20:08 +0000)]
am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
  Don't use screenshot if structure is disabled (2/2)

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 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

9 years agoam 730389bd: Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:49:25 +0000 (00:49 +0000)]
am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string

9 years agoam dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:49:23 +0000 (00:49 +0000)]
am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity

9 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

9 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

9 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