OSDN Git Service
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug:
22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]
Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]
[ConfirmPattern] use correct user id for stealth mode
Bug:
23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]
Fix issue #
23079119: Description for write settings permission says...
...it is for read and write
Just write.
And let's say, modify.
Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
Jason Monk [Mon, 10 Aug 2015 20:09:20 +0000 (20:09 +0000)]
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 19:58:09 +0000 (15:58 -0400)]
Remove extra help & feedback menu from power usage
Bug:
23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Ensure that listener is removed only if it was added" into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 22:59:28 +0000 (15:59 -0700)]
Block moving when already in progress.
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug:
22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
There be strings.
Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
Pavel Zhamaitsiak [Fri, 7 Aug 2015 19:02:38 +0000 (12:02 -0700)]
Ensure that listener is removed only if it was added
Bug:
23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
Maurice Lam [Wed, 5 Aug 2015 04:29:07 +0000 (21:29 -0700)]
[Fingerprint] Use different ring size for setup
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.
Bug:
22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
Julia Reynolds [Fri, 7 Aug 2015 16:29:41 +0000 (16:29 +0000)]
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
Geoff Mendal [Fri, 7 Aug 2015 04:20:12 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22879473
Bug:
22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "fix CC for work profiles" into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 18:21:31 +0000 (14:21 -0400)]
Wrap text on long preferences.
Bug:
22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
Julia Reynolds [Thu, 6 Aug 2015 14:54:44 +0000 (10:54 -0400)]
Hide optimization control on battery details page for non whitelisted apps.
Bug:
22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
Andres Morales [Tue, 4 Aug 2015 23:55:00 +0000 (16:55 -0700)]
fix CC for work profiles
Bug:
22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]
Hide show/hide system from battery optimizations list
Bug:
22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[Fingerprint] Update string for enrolling
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.
Also include other minor update to strings mentioned in the bug.
Bug:
22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
Billy Lau [Sat, 1 Aug 2015 17:12:33 +0000 (18:12 +0100)]
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].
Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
Ajay Panicker [Wed, 29 Jul 2015 18:39:16 +0000 (11:39 -0700)]
Implement Bluetooth settings factory reset (5/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
Maurice Lam [Tue, 4 Aug 2015 22:05:23 +0000 (15:05 -0700)]
[Fingerprint] Shrink fingerprint progress ring
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.
Bug:
22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
Nick Kralevich [Tue, 4 Aug 2015 19:45:58 +0000 (19:45 +0000)]
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
Jason Monk [Tue, 4 Aug 2015 19:25:32 +0000 (15:25 -0400)]
Remove summaries fro configure apps page
Bug:
22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
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
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
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
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
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
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
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
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
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
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
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
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
Maurice Lam [Fri, 31 Jul 2015 18:50:39 +0000 (18:50 +0000)]
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
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
Jeff Sharkey [Fri, 31 Jul 2015 01:46:44 +0000 (01:46 +0000)]
Merge "Let Settings measure transient free space." into mnc-dev
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
Maurice Lam [Fri, 31 Jul 2015 00:43:58 +0000 (00:43 +0000)]
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
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
Nick Kralevich [Thu, 30 Jul 2015 23:32:48 +0000 (16:32 -0700)]
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
In
ec323a0849155302b3b522fe34a2638be74af420, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.
Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.
Bug:
22447614
Bug:
21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
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
Fyodor Kupolov [Thu, 30 Jul 2015 20:50:03 +0000 (20:50 +0000)]
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
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
Jorim Jaggi [Thu, 30 Jul 2015 20:16:08 +0000 (20:16 +0000)]
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
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
Jeff Sharkey [Thu, 30 Jul 2015 19:24:53 +0000 (19:24 +0000)]
Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
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:
22345902,
22487370
Change-Id: I6066f3b78dbb32277ae94b79e325500724f83c7e
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
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
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
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
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
Jorim Jaggi [Wed, 29 Jul 2015 21:58:43 +0000 (21:58 +0000)]
Merge "Adjustments for find sensor screen" into mnc-dev
Sanket Padawe [Wed, 29 Jul 2015 20:03:32 +0000 (20:03 +0000)]
am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
19336da3f729fcde00782ae60124b1219bd4bf2b':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 19:49:53 +0000 (19:49 +0000)]
am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 19:25:06 +0000 (19:25 +0000)]
am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
Check for special char when renaming device for Wi-Fi direct.
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
Julia Reynolds [Wed, 29 Jul 2015 17:26:12 +0000 (17:26 +0000)]
Merge "Change assist app warning message text" 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
Julia Reynolds [Wed, 29 Jul 2015 17:15:14 +0000 (13:15 -0400)]
Change 'data' label to 'data usage'.
Bug:
22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
Sanket Padawe [Wed, 29 Jul 2015 17:08:45 +0000 (17:08 +0000)]
am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
df9b13af9bff0858c787000f1accee7dd1d2874d':
Check for special char when renaming device for Wi-Fi direct.
Julia Reynolds [Wed, 29 Jul 2015 17:01:10 +0000 (13:01 -0400)]
Change assist app warning message text
Bug:
22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
Sanket Padawe [Wed, 29 Jul 2015 16:44:58 +0000 (16:44 +0000)]
am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
74d85949507f3d9fdc75ace2acbec1aa7503b034':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:15:17 +0000 (16:15 +0000)]
am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
e05f71431548cba1b14807ba7f07a5df89c3f0a4':
Check for special char when renaming device for Wi-Fi direct.
Chris Wren [Wed, 29 Jul 2015 14:57:14 +0000 (14:57 +0000)]
Merge "fix InactiveApps instrumentation" 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
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
Julia Reynolds [Wed, 29 Jul 2015 12:25:28 +0000 (12:25 +0000)]
Merge "Bump string char limit." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 08:10:35 +0000 (10:10 +0200)]
Add contactless symbol to NFC resources.
Bug:
22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431
Martijn Coenen [Wed, 29 Jul 2015 07:54:04 +0000 (07:54 +0000)]
Merge "Fix tap & pay strings." into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 23:55:00 +0000 (16:55 -0700)]
Adjustments for find sensor screen
Bug:
22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
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
Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]
Merge "Prevent crash in app memory updater." into mnc-dev