Commit Graph

345 Commits

Author SHA1 Message Date
Daichi Hirono
0f6796284b Don't close USB type notification when USB is connected to USB devices.
Previously we show a notificatino to show the UsbModeChooser when
Android is connected to another Android via USB type C cable.
However UsbModeChoooser activity was closed immediately after a user
tapped the notification, if the Android worked as host.

FIXED=27535640

Change-Id: I707dcbf1021e7381096c0ae7cc2d712892ac5a5a
2016-03-22 11:04:29 +09:00
Meng Wang
dcd0bf72b8 Show ICCID in SIM status, if CarrierConfigManager allows.
Bug: 27574058
Change-Id: I5c08d31b5e8ea3c3ad79361e660256b070ff7284
2016-03-14 17:42:48 -07:00
Sudheer Shanka
115d15763d Adjust restricted lock positions as per new design.
Bug: 27263531
Change-Id: I7e38a9e3356ca43ed936de1e6f8190eba4d4773e
2016-03-10 07:54:36 -08:00
Sudheer Shanka
5d8e963c83 Merge "Part3 - Don't add padlock if the restriction is not set by admin." into nyc-dev 2016-02-19 19:31:45 +00:00
Jeff Sharkey
d36e574cfa Avoid division by zero in storage.
Bug: 26387833
Change-Id: I144475d4b82d91dcfd2271cd775e43d595914cef
2016-02-18 15:43:54 -07:00
Makoto Onuki
9dbad57a84 [Settings] Don't allow apps on external storage to be active admin
Bug 27149287

Change-Id: I7e0905228812fbc326cf4ac4984e7f59003996a8
2016-02-17 14:18:02 -08:00
Sudheer Shanka
9e9e63b7b3 Part3 - Don't add padlock if the restriction is not set by admin.
Bug: 26687435
Change-Id: Ibfea6d7d5bd32e7a05dcc2cc32b121c9e50b6a34
2016-02-16 11:04:11 +00:00
Chris Wren
9d1bfd1e8d port settings over to new metrics enum
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
2016-01-27 10:58:58 -05:00
Shishir Agrawal
d2b0fc066c Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
2016-01-26 13:48:21 -08:00
Sudheer Shanka
1c3fd76ee0 Add padlock to usb modes when disabled by admin.
Change-Id: I8504febd78f083eb3ff88926fe29d69edc62b6ef
2016-01-21 18:41:05 +00:00
Sudheer Shanka
ef550767b0 Trigger a support dialog when an action is disabled by policy
Change-Id: I847b481a16cce33fe7bd4040d38ec50ca62172c2
2016-01-20 21:00:44 +00:00
Amith Yamasani
61d1838ae2 Merge "Fix "division by zero" crash after USB mass storage disconnects" am: a44b4feed4
am: 4ed2bb1ba9

* commit '4ed2bb1ba93d8b5fe101c660d24898bf3ed44592':
  Fix "division by zero" crash after USB mass storage disconnects
2016-01-05 00:33:03 +00:00
Xinghan Yue
b997bd989e Fix "division by zero" crash after USB mass storage disconnects
File.java will return the total size in bytes of the partition
containing the path, and if the path does not exist,
it will return 0.

Change-Id: I134d4ec787b475e38bb37b4386bafcc419971c1e
2015-12-28 18:01:51 +01:00
Nick Kralevich
bb60fe9f06 Merge "Hide usb mode chooser dialog after disconnected" am: b913bf926e
am: 6556921a1e

* commit '6556921a1edbddea64b54415967b2bacbb7bf456':
  Hide usb mode chooser dialog after disconnected
2015-12-23 11:01:05 -08:00
Du, Changbin
93df36a1c7 Hide usb mode chooser dialog after disconnected
Add a UsbDisconnectedReceiver to listen usb state event, and hide
the usb mode chooser dialog if usb disconnected.

Change-Id: I871f56cb5a310e20950926180d9747dd9fad9754
Signed-off-by: Du, Changbin <changbin.du@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-12-22 15:26:13 +08:00
Jack Yu
4348604405 Added a new broadcast receiver to handle Brzail channel 50 area info
Moved the area info handler from CellBroadcastReceiver to
CellBroadcastAreaInfoReceiver.

bug: 25628456
Change-Id: I2c7c6bb83245fcb6d9cc7b5dce7496e906160bab
2015-12-03 11:53:26 -08:00
Ben Kwa
0c851297b4 Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE
BUG=23137963

Change-Id: I32e995b4421de4c90faa4e80a095c7df2f7aee25
2015-11-18 09:41:38 -08:00
Jason Monk
3069581512 Summary support for Settings Home
Also add summaries to a few of the major items.

Change-Id: I17924f14941fe095d819e142cdd21cf4b4e9ffd1
2015-11-17 13:51:45 -05:00
Felipe Leme
dc4dbbdb49 Set key when Explore preference is created, otherwise tapping it will cause a NPE.
BUG: 25597961

Change-Id: I1e2fc8caa961e1054472b46cbeb6aad407a1f91a
2015-11-09 15:52:32 -08:00
Felipe Leme
157ec2f09a Change workflow so update() is not called when the device changes orientation.
BUG: 24508289

Change-Id: I7929aac953741a19f5bc4ffbbb9929a9a2f6104e
2015-11-04 14:27:04 -08:00
Jason Monk
e779213d8e Merge "Don\'t show MIDI USB option if not supported" am: c2a9cd03f7 am: 92aafd3ed5
am: 1150cfce95

* commit '1150cfce95950f9de3e6e340b6d8efaf5bbd3eb0':
  Don't show MIDI USB option if not supported
2015-11-04 15:12:06 +00:00
Jason Monk
92aafd3ed5 Merge "Don\'t show MIDI USB option if not supported"
am: c2a9cd03f7

* commit 'c2a9cd03f71b3b6b0af2f6faaf877fd9c75dd9fe':
  Don't show MIDI USB option if not supported
2015-11-04 14:56:04 +00:00
Zoran Jovanovic
81ec094554 Don't show MIDI USB option if not supported
If device doesn't support MIDI, don't show MIDI in "Use USB for" menu
when USB cable is connected.
(Selecting MIDI will crash the Settings app.)

Change-Id: I60f4cbb6357f162fecb574cdb6766cf5ed92e78e
2015-11-04 15:21:58 +01:00
Jeff Sharkey
31691bffd7 Refresh storage UI when disk is destroyed.
Otherwise we leave stale items for the user to click on.

Bug: 25370499
Change-Id: Ia4492b7fb5a1a722bb92a583344677071ef07bba
2015-10-30 18:26:32 +00:00
Jason Monk
30e0a4a48a resolve merge conflicts of 8e18934478 to master.
Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
2015-10-20 14:29:43 -07:00
Jason Monk
417a0500c3 Hide SIM and IMEI for wifi only devices
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
2015-10-19 20:02:11 -04:00
Jeff Sharkey
1f5e53f9db am bfee8b48: am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev
* commit 'bfee8b484f3bb4807d185526058ea463f91f1091':
  Bail if activity was destroyed.
2015-10-16 16:33:53 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed.
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
2015-10-14 14:45:52 -07:00
Jason Monk
39b467482d Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04:00
Xiaohui Chen
538f6de918 A tiny refactor in settings
Change-Id: I5d3fb3f4ef86bb84de54a8992af476bbb58c2ee9
2015-09-21 10:14:56 -07:00
Xiaohui Chen
9965b1438b Cleanup OWNER in Settings
Bug: 19913735
Change-Id: Iada650431328a304f7c1e6acb8cbde76e4210127
2015-09-21 10:14:49 -07:00
Jason Monk
f2686165cf am cde29f77: am 618bc11b: am 72fecf9f: am d3c60afe: Include the usb data mode regardless of data role
* commit 'cde29f771a85dc3f7e5b567ffcaa07aaa486fcf4':
  Include the usb data mode regardless of data role
2015-09-10 20:53:52 +00:00
Jason Monk
d3c60afe52 Include the usb data mode regardless of data role
Turns out there are valid data modes in host mode (like midi).
Need to allow these through for the dialog to set the proper
current state.

Bug: 23905770
Change-Id: I7a37ad95ccaf18f211d2b2d330c7f1d7af4cfc16
2015-09-10 10:38:14 -04:00
Xiaohui Chen
6f03829e74 Cleanup remaining USER_OWNER in Settings
Bug: 19913735
Change-Id: I6894a7c81ed7504b02d533d9e9f65f800dbca895
2015-09-03 10:31:34 -07:00
Yasuhiro Matsuda
a5c73b423d Merge "Handle the case where null is returned for USB_STATE intent." 2015-08-26 09:36:41 +00:00
Jason Monk
38d1b86e09 am 12a4d031: am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
* commit '12a4d0313f8e964b727484448bd9b4ed8af1dc5f':
  Fix Usb-C dialog issues
2015-08-17 16:26:46 +00:00
Jason Monk
9d59a2441e Merge "Fix Usb-C dialog issues" into mnc-dr-dev 2015-08-17 15:29:52 +00:00
Jeff Sharkey
edf038205e am a334d530: am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit 'a334d53025fbbf187f5aad5abf61091f9c994e01':
  Only offer migration between private volumes.
2015-08-14 21:12:58 +00:00
Jeff Sharkey
82fee7bd0a am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
2015-08-14 18:29:15 +00:00
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