Jason Monk
3946f18abd
am 89a770fb: am f7b0dfd6: am f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit '89a770fb3bd86e4089e7858664380c7d7f21e578':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:24:58 +00:00
Jason Monk
89a770fb3b
am f7b0dfd6: am f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit 'f7b0dfd6aeff9c02e479c2ce6f2ddc97baa09331':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:12:48 +00:00
Jason Monk
f7b0dfd6ae
am f0fe5c58: Merge "Don\'t auto-focus text fields in hotspot dialog" into mnc-dev
...
* commit 'f0fe5c58e2274a550321f936c125c691f7a1646b':
Don't auto-focus text fields in hotspot dialog
2015-06-15 15:00:20 +00:00
Jason Monk
f0fe5c58e2
Merge "Don't auto-focus text fields in hotspot dialog" into mnc-dev
2015-06-15 14:51:28 +00:00
Jason Monk
3fd29f0697
am 637cb00c: am 20a837ea: am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
...
* commit '637cb00c9db191b8052d9aa26e6e873a05d4f1b9':
Handle switch of ssid to CharSequence (for spans)
2015-06-15 14:48:00 +00:00
Jason Monk
6b4a31c219
Don't auto-focus text fields in hotspot dialog
...
Instead focus the parent, so that the fields can be seen on smaller
screens before editing.
Bug: 19095568
Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
2015-06-15 10:45:46 -04:00
Jason Monk
637cb00c9d
am 20a837ea: am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
...
* commit '20a837ea52a77efa578aef58b7e108f59c3a8bcb':
Handle switch of ssid to CharSequence (for spans)
2015-06-15 14:35:25 +00:00
Geoff Mendal
ef7658713f
Merge "Import translations. DO NOT MERGE"
2015-06-15 14:32:29 +00:00
Geoff Mendal
d0ee913a5c
Import translations. DO NOT MERGE
...
Change-Id: Idb22432cce54225e2d9f02976473953daa7db514
Auto-generated-cl: translation import
2015-06-15 07:26:30 -07:00
Jason Monk
20a837ea52
am 6f229435: Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
...
* commit '6f229435367e6b5a775f42552be280fa35df1d56':
Handle switch of ssid to CharSequence (for spans)
2015-06-15 14:23:54 +00:00
Jason Monk
6f22943536
Merge "Handle switch of ssid to CharSequence (for spans)" into mnc-dev
2015-06-15 14:14:56 +00:00
Paul Jensen
e6ccd96efe
am 2d3f521f: am 020dc2e1: am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '2d3f521fe7fc8880c3fe0d9d19d471d9be8b15a3':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-15 14:11:13 +00:00
Jason Monk
c68b46c1f2
Handle switch of ssid to CharSequence (for spans)
...
Change to reference the string directly for places like search,
etc.
Bug: 20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
2015-06-15 10:09:55 -04:00
Paul Jensen
2d3f521fe7
am 020dc2e1: am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '020dc2e151c49e01da86a7bc597d5d8dd3ef335c':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-15 13:58:58 +00:00
Paul Jensen
020dc2e151
am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
...
* commit '04e3fca391b9d4fd0493f7ef38ab4f9b8ddafa95':
Remove dead hidden ConnectivityManager and NetworkInfo APIs.
2015-06-15 13:45:21 +00:00
Paul Jensen
04e3fca391
Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev
2015-06-15 13:36:58 +00:00
Jeff Sharkey
1d3f9bccdf
am 89751b05: am 7384b67e: am edb7b0d9: New storage dialogs.
...
* commit '89751b0571f37d5eaea5b0c2e34a333ec8f638cc':
New storage dialogs.
2015-06-15 04:44:40 +00:00
Jeff Sharkey
89751b0571
am 7384b67e: am edb7b0d9: New storage dialogs.
...
* commit '7384b67e159eed75a6e8744da27ee3eaa2ed308a':
New storage dialogs.
2015-06-15 04:32:54 +00:00
Jeff Sharkey
7384b67e15
am edb7b0d9: New storage dialogs.
...
* commit 'edb7b0d9a900a4a560d0777032600b52f38efd23':
New storage dialogs.
2015-06-15 04:20:55 +00:00
Jeff Sharkey
edb7b0d9a9
New storage dialogs.
...
Show a helpful dialog when a volume is unmounted or unmountable, or
when disk is unsupported. Add both missing private volumes and
unsupported disks in the storage list. Dialog to confirm when
forgetting private volume.
Finish volume detail activities when the volume becomes unmounted.
Show used space instead of free space to match string. When init'ing
a volume on non-adoptable disk, just format as public.
Bug: 21737573, 21666225, 21737666, 21471429
Change-Id: Id60d5a398e2b7923ebebdc5cfaef33248d8d77bb
2015-06-14 21:07:30 -07:00
Nick Kralevich
b6ee8483bb
am e1083155: am bc8985c6: am 9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
...
* commit 'e10831550ede1de3e0e00cb6d4a82319765c1f67':
Let UsbDeviceManager choose the appropriate function default
2015-06-13 03:43:23 +00:00
Nick Kralevich
3cb9434ca1
am a864e46b: am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
...
* commit 'a864e46b47ea20694ce9366295d997a1debffa02':
Fix bad USB configuration under Developer Options
2015-06-13 03:43:22 +00:00
Nick Kralevich
e10831550e
am bc8985c6: am 9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
...
* commit 'bc8985c6ee49e0feff3a48c399a03d8d882ea6bc':
Let UsbDeviceManager choose the appropriate function default
2015-06-13 03:31:21 +00:00
Nick Kralevich
a864e46b47
am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
...
* commit '20a0da89089984b12805b707c8644bb4413389c4':
Fix bad USB configuration under Developer Options
2015-06-13 03:31:18 +00:00
Nick Kralevich
bc8985c6ee
am 9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
...
* commit '9405a81f7ac4116e2715f5739fb5d7fd5c6458d8':
Let UsbDeviceManager choose the appropriate function default
2015-06-13 03:19:37 +00:00
Nick Kralevich
20a0da8908
am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev
...
* commit '64a8032f44da51d0422cb52af4631c7ae2545731':
Fix bad USB configuration under Developer Options
2015-06-13 03:19:36 +00:00
Nick Kralevich
9405a81f7a
Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
2015-06-13 03:12:27 +00:00
Nick Kralevich
64a8032f44
Merge "Fix bad USB configuration under Developer Options" into mnc-dev
2015-06-13 03:12:08 +00:00
Makoto Onuki
0642a2531f
am e0115ee5: am 75651de4: am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
...
* commit 'e0115ee5725541dfb6cbc42de70adfd1767edde5':
Add simple null checks to StorageWizard*, also listen to...
2015-06-13 00:35:14 +00:00
Makoto Onuki
e0115ee572
am 75651de4: am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
...
* commit '75651de4d17200d4aa0ae083303f8214c7b7478b':
Add simple null checks to StorageWizard*, also listen to...
2015-06-13 00:23:15 +00:00
Nick Kralevich
2d0f6a9d36
Let UsbDeviceManager choose the appropriate function default
...
Rather than hardcoding MTP as the appropriate default when the user
selects "Charger Only", call UsbDeviceManager.setCurrentFunction(null).
Null is intended to restore the default function, which is appropriate
for charging only.
Bug: 21429947
Change-Id: I9ee633bcf2f95f9937861c234ab044873202d41b
2015-06-12 17:18:05 -07:00
Makoto Onuki
75651de4d1
am 97d102d9: Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
...
* commit '97d102d9e207f3379ef94929e239de848c784754':
Add simple null checks to StorageWizard*, also listen to...
2015-06-13 00:09:57 +00:00
Makoto Onuki
97d102d9e2
Merge "Add simple null checks to StorageWizard*, also listen to..." into mnc-dev
2015-06-12 23:57:54 +00:00
Nick Kralevich
9cff8cdfe0
Fix bad USB configuration under Developer Options
...
The USB configuration screen under Developer Options hasn't been
updated for the new USB access control changes. Update it.
1) Ensure that the default in Development Settings is "Charger Only".
2) Changing USB mode in developer settings only changes the USB function.
It doesn't unlock any USB data.
Bug: 21258972
Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
2015-06-12 16:30:45 -07:00
Makoto Onuki
1d37d0f7fb
Add simple null checks to StorageWizard*, also listen to...
...
the disk destroyed event.
Bug 21336042
Change-Id: I9f53501a6122a4a9046774e3c4c08b5d6d6f8552
2015-06-12 16:28:18 -07:00
Selim Cinek
e0c9e0f4ce
am 827c5419: am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
...
* commit '827c5419fa8e68bd0d7807e1799344e7760f1363':
Added an introduction to the fingerprint enrollment
2015-06-12 22:29:20 +00:00
Selim Cinek
827c5419fa
am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
...
* commit '0abc4fb6e3c055e4107edd5a32466b4f4c90a7a8':
Added an introduction to the fingerprint enrollment
2015-06-12 22:22:27 +00:00
Selim Cinek
0abc4fb6e3
am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
...
* commit 'ee5db351ac773f42d2fb2674545b82d1d1d0cdd5':
Added an introduction to the fingerprint enrollment
2015-06-12 22:11:56 +00:00
Selim Cinek
ee5db351ac
Merge "Added an introduction to the fingerprint enrollment" into mnc-dev
2015-06-12 21:57:45 +00:00
Makoto Onuki
4f33dc0416
am 0b5b05e2: am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev
...
* commit '0b5b05e2f5883868aea2d8bb36ef1c95d643722d':
Promote "add service" from menu to list item
2015-06-12 16:55:19 +00:00
Rubin Xu
8b336e74b7
am 7d4f7abc: am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
...
* commit '7d4f7abc280f44e57d57b21b793bc4657f99bfa8':
Defensively load untrusted icons from account authenticator
2015-06-12 16:55:18 +00:00
Makoto Onuki
0b5b05e2f5
am 20468a11: am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev
...
* commit '20468a1160eef269b7116535128daeedfbb7811a':
Promote "add service" from menu to list item
2015-06-12 16:40:31 +00:00
Rubin Xu
7d4f7abc28
am 4c5eaae5: am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
...
* commit '4c5eaae564f20e47e6c3a4f7906446b195c639da':
Defensively load untrusted icons from account authenticator
2015-06-12 16:40:29 +00:00
Makoto Onuki
20468a1160
am e0142a67: Merge "Promote "add service" from menu to list item" into mnc-dev
...
* commit 'e0142a67fd5f3dc52c82fed05d89735ad6a42aeb':
Promote "add service" from menu to list item
2015-06-12 16:28:30 +00:00
Rubin Xu
4c5eaae564
am 47d329f7: Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
...
* commit '47d329f79af7ae74e6b840eb90c15b7cdc294b53':
Defensively load untrusted icons from account authenticator
2015-06-12 16:28:29 +00:00
Makoto Onuki
e0142a67fd
Merge "Promote "add service" from menu to list item" into mnc-dev
2015-06-12 16:18:31 +00:00
Rubin Xu
47d329f79a
Merge "Defensively load untrusted icons from account authenticator" into mnc-dev
2015-06-12 16:18:16 +00:00
Kenny Guy
c7013f4dd6
am 6816994e: am a381632d: am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev
...
* commit '6816994e85c416f55cdc4621877a12749d2f6fcc':
Remove incorrect TODO and meta-data.
2015-06-12 15:47:16 +00:00
Kenny Guy
6816994e85
am a381632d: am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev
...
* commit 'a381632db055eb7cf72a740fb8416315e562ba82':
Remove incorrect TODO and meta-data.
2015-06-12 15:36:14 +00:00
Kenny Guy
a381632db0
am dabba2f6: Merge "Remove incorrect TODO and meta-data." into mnc-dev
...
* commit 'dabba2f6c41ae366c65c4667ee7be312eb96f39a':
Remove incorrect TODO and meta-data.
2015-06-12 15:23:56 +00:00