Commit Graph

1256 Commits

Author SHA1 Message Date
Jeff Sharkey
6f52ed3332 Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.

Bug: 22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
2015-08-14 09:46:03 -07:00
Jeff Sharkey
5f2194855f am 6dcc2004: am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '6dcc2004ad49c7b2cbdb5fc87a9b83d1be1cccaf':
  Show storage slow dialog allowing state loss.
2015-08-14 03:27:38 +00:00
Jeff Sharkey
c73287b9db am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
  Show storage slow dialog allowing state loss.
2015-08-14 01:24:41 +00:00
Jeff Sharkey
0814827e8f 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
2015-08-13 16:57:48 -07:00
Jason Monk
94e460fd45 Fix Usb-C dialog issues
- Fix theme
 - Fix PTP bug introduced in initial USB-C support

Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
2015-08-12 14:14:33 -04:00
Yasuhiro Matsuda
acb7b31bff Handle the case where null is returned for USB_STATE intent.
USB_STATE is not received if USB_STATE has not changed from
the initial state. This CL adds handling for that case.

BUG: 22163689
Change-Id: I232a558caaac4f4984f7629e2574d478fc7ad432
2015-08-07 18:14:04 +09:00
Jason Monk
b3e81e1004 am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:10:14 +00:00
Jason Monk
9824c5da1e resolved conflicts for merge of 1adca55f to mnc-dr-dev
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04:00
Jason Monk
5d402d59bc am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
  Update USB dialog for USB-C power option
2015-08-04 18:23:57 +00:00
Jason Monk
83290eef8c Update USB dialog for USB-C power option
Also includes a bit of visual updates, options now have summaries
as well.

Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.

Currently devices don't have USB-C ports, they can be simulated
with the following commands:
  $ adb shell dumpsys usb add-port "matrix" dual
  # ?s control whether these can be changed
  $ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
  # Do testing here
  $ adb shell dumpsys usb disconnect-port "matrix"
  $ adb shell dumpsys usb remove-port "matrix"
  $ adb shell dumpsys usb reset
  # Use the help for more info
  $ adb shell dumpsys usb -h

Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
2015-08-04 09:18:57 -04:00
Nick Kralevich
8a9b03f746 UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
In ec323a0849, 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
2015-07-30 16:34:01 -07:00
Jeff Sharkey
c9a811619b am 31566703: am 600cfe2f: am a61c803e: am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit '3156670323c2c909a05215c464181db44abbe991':
  Refresh after clearing, tweak warn threshold.
2015-07-30 19:59:20 +00:00
Jeff Sharkey
f99b424f3b 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
2015-07-30 11:51:47 -07:00
Xiaohui Chen
44879a387a sys user split: first pass updating Settings
Update various places in Settings to use "admin" ueser flag
instead of checking user id "0".  This should be no-op in
single user mode since the only admin user would be user 0.
In split system user mode, this will correctly ACL admin
user instead of non-interactive system user.

Bug: 19913735
Change-Id: Ida4d59c5f689ea0dc34b3b3ff0822b087fa0afd6
2015-07-27 15:39:28 -07:00
Guang Zhu
5e83b0d9fa am 29936b07: am 5ea94a9c: am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
  Prevent monkey from changing adoptable storage settings
2015-07-24 04:50:00 +00:00
Guang Zhu
c1bef7430e Prevent monkey from changing adoptable storage settings
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
2015-07-23 10:57:59 -07:00
Daichi Hirono
35197218fc Merge "Turn the eject menu into a button." 2015-07-21 06:14:37 +00:00
Daichi Hirono
5e76cdc9dd Turn the eject menu into a button.
BUG=21897892

Change-Id: Icd0db7907b990447c99c4ae65816e85777df0f8e
2015-07-17 15:26:15 +09:00
Sanket Padawe
423a891b38 am 45c5de2f: am e07fce2c: am 18c31082: am c5be2243: am 046decca: Merge "Use common xml file for multi-tab settings." into mnc-dev
* commit '45c5de2f62bcdea70a5f25f60ab10398f5911574':
  Use common xml file for multi-tab settings.
2015-07-16 06:02:20 +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
Jason Monk
02da7d3b11 am 64570b2b: am 06e549fa: am eb37daff: am b6cb215c: am cd075edf: Merge "Fix Help menu for PrivateVolumeSettings" into mnc-dev
* commit '64570b2b70afecad5936f6a39c09023ff6c1a625':
  Fix Help menu for PrivateVolumeSettings
2015-07-15 16:04:57 +00:00
Jason Monk
f05248f88f Fix Help menu for PrivateVolumeSettings
Call super.onCreateOptionsMenu so that the auto help stuff can
work properly.

Bug: 22202745
Change-Id: Iee6b4a81574c7e981290465a78641f3c5b06c143
2015-07-14 15:00:22 -04: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
Sanket Padawe
20728bfc35 am ed6c19ae: am b1167763: am 389fbb74: am 2db9291e: am 7995ca41: Use same technology type for LTE/4G
* commit 'ed6c19aefa6e6c542e957b653d8f6f392a7b0fb6':
  Use same technology type for LTE/4G
2015-07-14 16:42:07 +00:00
Zoltan Szatmary-Ban
25b3876b19 am ba79dc4d: am 0998e03a: am e4e52064: am c968c407: am 098c296d: Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
* commit 'ba79dc4d32e6fb909732b04b9cec562aa4a762da':
  Do not throw exception when MeasurementDetails.mediaSize is empty
2015-07-14 16:42:04 +00:00
Sanket Padawe
7995ca4165 Use same technology type for LTE/4G
Though status bar and preferred network type show 4G, still show
LTE in SIM status when device set config_show4GForLTE true

Bug: 22213113
Change-Id: I2866a868992af7b4eb661d693a0cce60bb1b3402
2015-07-13 10:15:41 -07:00
Zoltan Szatmary-Ban
098c296df2 Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev 2015-07-13 13:09:54 +00:00
Zoltan Szatmary-Ban
706e7014d8 Do not throw exception when MeasurementDetails.mediaSize is empty
It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:

mVolume == null || !mVolume.isMountedReadable()

Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
2015-07-13 12:37:31 +01:00
Zoltan Szatmary-Ban
b211a5d2b9 am e14e92a2: am 4dc5b67c: am b8254212: am 325ba385: am 4bbe3d1f: Update all shown preferences in Settings > Storage
* commit 'e14e92a2ceac5827e35aa62ba6a82d3f87300d50':
  Update all shown preferences in Settings > Storage
2015-07-09 16:07:29 +00:00
Zoltan Szatmary-Ban
4bbe3d1fb6 Update all shown preferences in Settings > Storage
This is achieved by iterating through the pool of StorageItemPreferences up
to the index of the last shown one, instead of iterating through the
preferences of the screen which may miss preferences inside other top-level
preference groups.

Bug: 22353561
Change-Id: I2293a7949a5becfb506d6b7965f8db2f11845756
2015-07-09 15:37:26 +01:00
Jeff Sharkey
b7f6b87aa5 am 2f87423c: am 05d51e24: am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev
* commit '2f87423cb3b3e8ccdd40a08d26d535c716061b9d':
  Move storage when formatting primary disk.
2015-07-08 23:06:35 +00:00
Jeff Sharkey
80eba76b10 Merge "Move storage when formatting primary disk." into mnc-dev 2015-07-08 21:55:44 +00:00
Zoltan Szatmary-Ban
f601bec35e am 87e918cd: am 2f279c3a: am 2cd50c45: am 03b73068: am 296e0aff: Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev
* commit '87e918cdf0ff92c8beee43b9f0be514d608c7b4c':
  Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
2015-07-08 15:16:29 +00:00
Zoltan Szatmary-Ban
df57fa52ab resolved conflicts for merge of 8eade69d to master
Change-Id: Id2a2269b506c2ffa06dcfd3a02b32eced5e7632b
2015-07-08 16:05:49 +01:00
Zoltan Szatmary-Ban
296e0aff02 Merge "Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on" into mnc-dev 2015-07-08 11:45:04 +00:00
Jeff Sharkey
697ff544bf Move storage when formatting primary disk.
On devices where the primary storage is configured as a physical
device, and when we adopt that device, automatically move the
primary storage to be hosted on the newly created emulated volume.

Bug: 20275423
Change-Id: I759e65a01b323ef3c9ffb86d0b7c8e7b4768a45c
2015-07-07 22:14:18 -07:00
Zoltan Szatmary-Ban
6a00f6cf0b Making Settings > Storage multiprofile aware
Also fixing the order of preferences there.

Bug: 22223456
Bug: 22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34
2015-07-07 20:33:30 +01:00
Zoltan Szatmary-Ban
ec323a0849 Filter USB options on chooser when DISALLOW_USB_FILE_TRANSFER is on
Bug: 22291579
Change-Id: I32611404ef5f58c7484fe5c4b7a4f7782cc8daa3
2015-07-07 13:24:07 +01:00
Jeff Sharkey
fa7c4905d4 am fe7cea03: am 41e81016: am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
* commit 'fe7cea03af1b5fca75a0e8931945c8e288a5d7ae':
  Fix init order so we have something to measure.
2015-07-07 00:31:45 +00:00
Jeff Sharkey
d17921337d am b126a4ea: am 084dd048: am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
* commit 'b126a4ea4abffecd9580b1c56cde22f58e7f742d':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.
2015-07-07 00:31:43 +00:00
Jeff Sharkey
215fa65c10 Fix init order so we have something to measure.
Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.

Bug: 22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea
2015-07-06 10:17:44 -07:00
Jeff Sharkey
48751c1a51 Fix some ordering, colors, and accessibility bugs.
When adding preferences to public/private details screens, always
add in-order when rebuilding.  Hacky fix for broken summary text and
eject image color tints.

Fix crash when device rotated during partitioning.  Set correct
accessibility titles in all wizard steps.

Bug: 22098044, 21376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
2015-07-05 22:10:13 -07:00
Jeff Sharkey
6a0082b483 Handle missing migration source volume.
Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156
2015-07-05 14:25:44 -07:00
Daichi Hirono
3de1dff6cb Merge "Use 'setup' header illust before selecting storage type." 2015-07-03 02:14:05 +00:00
Daichi Hirono
c22816362c Show bar graphs for internal storage items (Apps, images, video etc.).
BUG=21898434

Change-Id: I8285088c7bef82bbd63fa38d6a95180079acd195
2015-07-02 17:54:29 +09:00
Daichi Hirono
fba2fd8375 Use 'setup' header illust before selecting storage type.
Previously the storage setup wizard shows 'internal' header illust before user
selects storage type.  The CL turns the initial illust into 'setup' header
illust.

BUG=22211635

Change-Id: Ie429a6197d210e0bd1ef8d0af6abb6f83295ac50
2015-07-02 15:38:39 +09:00
Amith Yamasani
a8c4db48c2 Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev 2015-06-30 23:00:28 +00:00
Amith Yamasani
350274040e Only allow admin users to adopt sd card as internal storage.
Bug: 21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562
2015-06-30 14:23:54 -07:00
Makoto Onuki
0c0858acad Make sure Fragments are public for FragMan to instantiate
Bug 21990428

Change-Id: If2dd5e43a4cc73ccf60278fdab874516c7fc181b
2015-06-25 17:01:54 -07:00
Daichi Hirono
ae56c1449a Remove while box at the top right of storage setup wizard.
The CL specify correct ID for the tile asset.

BUG=22049781

Change-Id: Ib7800487518e017fab1110fde5d70cc35bceffb7
2015-06-25 13:44:44 +09:00