Commit Graph

1256 Commits

Author SHA1 Message Date
Daniel Nishi
4938a9a470 Merge \"Remove the Deletion Helper and Automatic Storage Management jobs.\" into nyc-mr1-dev
am: de17410d37

Change-Id: I8b7cc9e6b3f6579f0ea0ebca827967a39a562697
2016-06-22 23:59:02 +00:00
Daniel Nishi
de17410d37 Merge "Remove the Deletion Helper and Automatic Storage Management jobs." into nyc-mr1-dev 2016-06-22 23:52:23 +00:00
Daniel Nishi
bf8f896879 Update the deletion helper intent string.
Bug: 28675265
Change-Id: Ic56e1617d0cf66e347c3a9b31592de4737b19bb3
2016-06-21 16:06:12 -07:00
Daniel Sandler
92e908b68e Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
am: 7df9a28fdb

Change-Id: I14d23175a455c21df8d526bfa2ae034e80e199d5
2016-06-21 18:28:35 +00:00
Dan Sandler
698fe0a9b0 Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I94d18998914552d21099b12b22471ea93857cf52
2016-06-21 18:18:21 +00:00
Dan Sandler
7df9a28fdb Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I40778ba470d12dd6f5b924ddcf650f27459faab6
2016-06-21 18:17:08 +00:00
Daniel Nishi
aad643caf2 Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.

Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
2016-06-21 10:00:52 -07:00
Dan Sandler
89d5659643 Show "0" instead of "0 B" in storage settings.
Two benefits:
  - "0 B" might be a little confusing for sighted users
  - "zero bee" is definitely confusing for TalkBack users

Nonzero storage items will still read as "640 KB" which
should be enough for anyone.

Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes: 27973778
2016-06-21 00:33:16 -04:00
Daniel Nishi
4765fd9a4b Merge \"Show storage manager settings using a system property.\" into nyc-mr1-dev
am: 3d040e55d9

Change-Id: I2adbcb4260adc1719549ac4e26700a6dc099481e
2016-06-15 22:19:34 +00:00
Daniel Nishi
3d040e55d9 Merge "Show storage manager settings using a system property." into nyc-mr1-dev 2016-06-15 22:14:09 +00:00
Daniel Nishi
0074855229 Show storage manager settings using a system property.
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.

Bug: 29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
2016-06-15 11:01:58 -07:00
Jason Monk
2f4c80f3c7 Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

Change-Id: I49ceb02471844e719da35f1939c329f317b6953b
2016-06-15 16:59:09 +00:00
Jason Monk
4edb76127c Merge \\"Fix SimStatus updatePhoneInfos\\" into nyc-dev am: b53117f55c
am: e3eaa08742

Change-Id: I891dcc41ec37a1de641beeb3690695fdab385e66
2016-06-15 16:58:59 +00:00
Jason Monk
e3eaa08742 Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am: b53117f55c

Change-Id: I8214420cb1a2c7f9d462650908c1546adcc3b950
2016-06-15 16:53:55 +00:00
Jason Monk
c7959f91d5 Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.

Also return the right view in onCreateView

Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes: 29335528
2016-06-15 10:54:33 -04:00
Sanket Padawe
30341d7924 Fix bug in Sim Status Settings. am: fb87919fde
am: 8b1acb7973

Change-Id: I8d8c7ef15e81530ce21849eb2ff034ea10b2ea13
2016-06-14 18:07:13 +00:00
Sanket Padawe
be5fbd9954 Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I696fa92d6ae21a9df386c60287da0ed298f3615d
2016-06-14 18:04:52 +00:00
Sanket Padawe
8b1acb7973 Fix bug in Sim Status Settings.
am: fb87919fde

Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899
2016-06-14 18:04:52 +00:00
Sanket Padawe
fb87919fde Fix bug in Sim Status Settings.
Bug: 29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
2016-06-14 10:12:39 -07:00
Jason Monk
aaaa236cec resolve merge conflicts of 7f7092c to nyc-mr1-dev
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
2016-06-08 16:19:35 -04:00
Jason Monk
84f544a2ae resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
2016-06-08 15:28:48 -04:00
Jason Monk
167f6cc87c Merge \"Remove PreferenceActivity\" into nyc-dev
am: 7f7092c705

Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
2016-06-08 19:15:42 +00:00
Felipe Leme
05d8b9da4d Merge \"Display total storage for Internal shared storage.\" into nyc-mr1-dev
am: d4e31320c1

Change-Id: I0a4c996177ecc57352af4b6be244af7b9e09b1d2
2016-06-08 16:17:18 +00:00
Felipe Leme
ff162a3c23 Display total storage for Internal shared storage.
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".

This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.

BUG: 24128505

Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1

** Cherrypicked from master - DO NOT MERGE **
2016-06-08 14:49:32 +00:00
Jason Monk
b7e4380cd2 Remove PreferenceActivity
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.

Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Daniel Nishi
5ba545ee06 Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev
am: 39d2913e1c

* commit '39d2913e1cfd455b0f8d571e4656ee6288392425':
  Hide the Deletion Helper entry points from Settings.

Change-Id: I5f436a6d19e5e31f6fb5dc04e02a0ad63baaca42
2016-05-26 20:31:53 +00:00
Daniel Nishi
39d2913e1c Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev 2016-05-26 20:28:14 +00:00
Daniel Nishi
728eebe3c0 Hide the Deletion Helper entry points from Settings.
Remove the menu item which enters the Deletion Helper fragment.
The deletion helper can still be accessed if storage management is
enabled in the storage management settings.

Bug: 28967987
Change-Id: Iff4730998edbab5889b2b8e23b6ad260ae0c0359
2016-05-26 11:14:07 -07:00
Derek Tan
3f1ca3a975 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6
am: a12ac3c683

* commit 'a12ac3c683e5bf675d844f5bde549b231353b0e8':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I1ffe959d6279c1390f2d364ff5ceb8d46f0a295a
2016-05-26 00:01:52 +00:00
Derek Tan
a12ac3c683 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
am: 08e24d43b6

* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I21c3a65f2c6000ca207c0ca8bceb5316325c5e22
2016-05-25 23:51:58 +00:00
Derek Tan
6193fb90ae Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
am: 08e24d43b6

* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: Ib804dcf00e5e183d3d9c02bc14513c98a7852ace
2016-05-25 23:51:49 +00:00
Derek Tan
d1151c19d8 Use getConfigForSubId instead of getConfig(int).
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
2016-05-25 15:00:27 -07:00
Daniel Nishi
ce584ff754 Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
am: 97ac5c773d

* commit '97ac5c773da07d637ef0e92edbde4052714683ab':
  Update the storage manager settings to match the mocks.

Change-Id: I9c6ed838d3f58fb97c93779c9378f59bb88b1b66
2016-05-24 21:32:37 +00:00
Daniel Nishi
ba03d2ff21 Update the storage manager settings to match the mocks.
Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
2016-05-23 13:27:30 -07:00
Daniel Nishi
d85a19a970 Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev
am: 83ff4b06ec

* commit '83ff4b06ecae86cbfed75938df793628723c076c':
  Add an upsell dialog to activate the storage manager.

Change-Id: I0ac4d60411b135db3d3f876f4bec98c2663adf4c
2016-05-19 17:01:27 +00:00
yifan.bai
dd433d73e7 Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9 am: eb88257f07
am: aae2022cb5

* commit 'aae2022cb593e1e96d7629b9c76a6eb5a58db4ff':
  Fix register multiple PhoneStateListeners.

Change-Id: I5e2d8a59bda82246af553e16f98e7827ae6f99ef
2016-05-18 18:14:24 +00:00
Robert Greenwalt
aae2022cb5 Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9
am: eb88257f07

* commit 'eb88257f076323771fd1e9805708441efc2af03f':
  Fix register multiple PhoneStateListeners.

Change-Id: Iece8c8bd197ed03835720f31174c710495a5998f
2016-05-18 18:06:49 +00:00
Daniel Nishi
0216e9dc2e Add an upsell dialog to activate the storage manager.
After a manual clear, the user will be prompted to turn
on the storage manager, if it is turned off. The prompt
will only show up after certain defined delay times and
stop showing up entirely if denied enough times.

Currently, the dialog does not actually turn on the storage
manager because the storage manager is not yet landed.

Bug: 28801159

Change-Id: I3c221786d08a7102b3b5357416ab12692d1894cf
2016-05-18 09:25:38 -07:00
Daniel Nishi
116a55cdab Add the automatic storage manager settings.
This provides a toggle for changing if the storage manager
is turned on or off and how many days of data to retain.

It is currently not hooked up to anything currently and only acts as
the view, pending b/28600825.

Bug: 28560570
Change-Id: Iaa2d819f26addab4dc02ced80e9ba79e0fcf0980
2016-05-17 09:32:12 -07:00
yifan.bai
4bf1704650 Fix register multiple PhoneStateListeners.
To avoid multiple PhoneStateListeners are registered, when user changes
the tab between SIMs, unregister the previous listener.

Change-Id: I99cf36a2c25bfbb74322b55efc6d751ea96810e5
2016-05-17 09:47:43 +00:00
Felipe Leme
23c69bb59f Merge "Fixed calls to update() when configuration changed." into nyc-dev
am: f4f2211b13

* commit 'f4f2211b1364422abec41e056af77c03247c3f4e':
  Fixed calls to update() when configuration changed.

Change-Id: Ia35d89560fe2dd51d1c0dc8da3d1209c2cb03622
2016-05-13 17:44:41 +00:00
Felipe Leme
6ebd561960 Fixed calls to update() when configuration changed.
update() is an expensive operation and should only be called
once under normal circumstances (it still needs to be called due to external changes). In particular, it should not be called again on orientation changes.

The first approach to solve the orientation change caused the volume title to not be shown when the screen changed on multi window environments; the fix for title issue caused the update to be called again on configuration changes.

This change properly fixes both issues by removing the onAttach() / onDetach() methods and using a clearer variable (mNeedsUpdate) to avoid future regressions.

BUG: 24508289
BUG: 27989238
Change-Id: I140f5a541cda293f1c476d3b80a5bc8918e18b08
2016-05-12 14:43:35 -07:00
Jason Monk
29b86d10d5 Merge "Fix unmount up button" into nyc-dev
am: 7680871d92

* commit '7680871d92cd9fa31a3f515d112767644745f26e':
  Fix unmount up button

Change-Id: I4c803b0664abd85956b724b782820920dced6a31
2016-05-11 18:18:37 +00:00
Jason Monk
0aed68d6b9 Fix unmount up button
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes: 28704198
2016-05-11 13:53:13 -04:00
Philip P. Moltmann
fe99c4282e Merge "Read disk ID from intent" into nyc-dev
am: e0e7fa4501

* commit 'e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
  Read disk ID from intent

Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4
2016-05-02 23:24:05 +00:00
Philip P. Moltmann
e0e7fa4501 Merge "Read disk ID from intent" into nyc-dev 2016-05-02 23:00:30 +00:00
Maurice Lam
ec3fec5f94 Merge "Remove top padding only if illustration is present" into nyc-dev
am: 0e4816efb9

* commit '0e4816efb99e28a25efecee1702c552bfb9ba849':
  Remove top padding only if illustration is present

Change-Id: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
2016-05-02 18:05:23 +00:00
Maurice Lam
0e4816efb9 Merge "Remove top padding only if illustration is present" into nyc-dev 2016-05-02 17:58:10 +00:00
Philip P. Moltmann
2fc2eb49a9 Read disk ID from intent
mDisk might be null, but we can recover the disk ID from the original
Intent.

Bug: 28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
2016-04-29 16:35:28 -07:00
Maurice Lam
4d227268c6 Remove top padding only if illustration is present
Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
2016-04-29 15:07:40 -07:00