Commit Graph

3007 Commits

Author SHA1 Message Date
Michal Karpinski
24fc55bf27 Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: 8532049946
am: c0832141a0

Change-Id: Ieaa2292d49809073c7faa92861d73a4379f1d3fa
2016-06-13 17:52:25 +00:00
Michal Karpinski
c0832141a0 Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04
am: 8532049946

Change-Id: I46c26216d66aa9478d4c8d71cbe7baf4a47de50e
2016-06-13 17:44:09 +00:00
Michal Karpinski
5666e5556f Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
Removing because user might not be able to remove (because the option is disallowed).

Bug: 29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
2016-06-13 16:52:58 +01:00
Meng Wang
95dd0323a6 Merge \\"Wi-Fi Calling settings UI update\\" into nyc-mr1-dev am: 7648de1ec6
am: 9b345526b7

Change-Id: I4b7c93a793efd63107236dc96cec88263957f10b
2016-06-10 16:44:28 +00:00
Meng Wang
7648de1ec6 Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev 2016-06-10 16:36:46 +00:00
Roozbeh Pournader
0e3b675446 Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am: 5eddc4bde9

Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7
2016-06-09 23:07:09 +00:00
Roozbeh Pournader
3697dbeaa3 Use existing localizations for formatting data usage [DO NOT MERGE]
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.

Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.

Bug: 28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
2016-06-09 13:25:56 -07:00
TreeHugger Robot
b75865d9dd Merge "Removed unused string (high_power_count)." 2016-06-09 17:20:43 +00:00
Felipe Leme
a889cf761c Removed unused string (high_power_count).
Change-Id: I3ababf4fd0c7f4ae9c9a64a3cf05d5a9db291cba
Fixes: 29220742
2016-06-08 16:50:51 -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
9667149282 Merge \\"Fix data usage format strings\\" into nyc-dev am: cb1972b908
am: 2c7e1d844f

Change-Id: I7240bac72b08c251bf90c433d4febe5e8f725f4b
2016-06-08 19:26:48 +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
Meng Wang
0dc4311333 Wi-Fi Calling settings UI update
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
2016-06-06 16:49:02 -07:00
Jason Monk
aa5a8a6a4c Fix data usage format strings
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Andrew Sapperstein
905ab6b743 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev am: 6c52398695
am: 66fb65b867

* commit '66fb65b867dcbb00276b5104228e9b5a82da8c90':
  Add safety & regulatory info to "about device".

Change-Id: I2ef8b0e7efc702d8652c5f6bf6e8be7e4d9e21df
2016-06-04 00:24:23 +00:00
Jason Monk
152a7072af Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf am: 8a1d371239
am: f7d775c3d6

* commit 'f7d775c3d6a699eab12efed7a54f68165d805a64':
  Fix accidental non-translatable string

Change-Id: I2e003723d8b778fda71a36e4077e491777149467
2016-06-04 00:24:22 +00:00
Andrew Sapperstein
6c52398695 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev 2016-06-03 22:22:38 +00:00
Jason Monk
8a1d371239 Merge "Fix accidental non-translatable string" into nyc-dev
am: 8c5dccc6bf

* commit '8c5dccc6bf05397cf4c51ce88d561fecbebba059':
  Fix accidental non-translatable string

Change-Id: I71c42ccd2daca0801263809edb36eb4d175d444a
2016-06-03 22:21:47 +00:00
Jason Monk
8c5dccc6bf Merge "Fix accidental non-translatable string" into nyc-dev 2016-06-03 19:12:09 +00:00
Jason Monk
18b603f84f Fix accidental non-translatable string
Bug: 29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
2016-06-03 15:06:56 -04:00
Andrew Sapperstein
1fad9af3c7 Add safety & regulatory info to "about device".
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".

The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.

BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
2016-06-02 14:12:19 -07:00
Wei Wang
0319f37b69 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c am: 704476a96d
am: 1aa166f490

* commit '1aa166f490910b2fb0f90c3c7703c1b779938b24':
  Revert "Add an entry in developer options for location tools."

Change-Id: I93d4f261feb7efdeae5559eba729066c4f4061e2
2016-06-02 17:28:42 +00:00
Wei Wang
1aa166f490 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev am: d0d3ca3b7c
am: 704476a96d

* commit '704476a96d5363679ddcb6d311bb6ca7c4a5faae':
  Revert "Add an entry in developer options for location tools."

Change-Id: I3ed38b246d4f9aa64daa1c432d8f0b5020515e5a
2016-06-02 17:25:41 +00:00
Wei Wang
c687e9bfbd Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
am: d0d3ca3b7c

* commit 'd0d3ca3b7c64dc30c5262251b5a6f610e2127a69':
  Revert "Add an entry in developer options for location tools."

Change-Id: I66441bf21ddd8f0977bcaec7d92a28406e3bcf0e
2016-06-02 17:22:59 +00:00
Wei Wang
d0d3ca3b7c Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev 2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba Revert "Add an entry in developer options for location tools."
Bug:28251942

This reverts commit e1c1a13cba.

Change-Id: I864a813e8f6a9488b4db2f876a0097e947ceae45
2016-06-02 04:42:02 +00:00
Meng Wang
fddffa539d Launch E911 address management activity at turning on Wifi Calling am: 90e8e4713c
am: 0500f2bede

* commit '0500f2bedefe3ecf61e395d5a2285c6972024b3d':
  Launch E911 address management activity at turning on Wifi Calling

Change-Id: Ibcc27498999a5f2f62589bab349318cbdb6f2a50
2016-06-01 00:57:14 +00:00
Meng Wang
90e8e4713c Launch E911 address management activity at turning on Wifi Calling
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
2016-05-31 15:57:27 -07:00
Daniel Nishi
b6b9d830d6 Merge "Add an automatic storage management job service." into nyc-mr1-dev am: d7efefa503
am: f878423e3d

* commit 'f878423e3dd6cebaac5b77a91c95f2e3ae58c125':
  Add an automatic storage management job service.

Change-Id: I63cfc0885b1075e73fbeed65eac8c04eef161851
2016-05-31 18:33:56 +00:00
Daniel Nishi
80c204420b Add an automatic storage management job service.
This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.

This is a temporary landing place and will be refactored very
quickly out of Settings.

Bug: 28600825

Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7
2016-05-31 16:50:48 +00:00
Daniel Nishi
33658f63af Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev am: 668c297603
am: dd8ab483cb

* commit 'dd8ab483cbde1d701468c510d9df0de1d2496b84':
  Update the summary strings in the Deletion Helper to match the latest mocks.

Change-Id: I392115b87592bc314458120bedc2f712a37dd5fb
2016-05-25 20:08:03 +00:00
Daniel Nishi
84d944b0bc Update the summary strings in the Deletion Helper to match the latest mocks.
Bug: 28917902
Change-Id: I35af7483f2a97dffc230093a90f0b7d87a4532c1
2016-05-25 11:11:03 -07:00
Daniel Nishi
e9d8c8d58c Change Downloads to show individual files in the Deletion Helper. am: 1370f7ed20
am: 5a546fbcaf

* commit '5a546fbcafded7e7244c2e7c2f95eb3f828c813e':
  Change Downloads to show individual files in the Deletion Helper.

Change-Id: I974c1afee291448caf9656dabbae4f8637a3d17e
2016-05-24 23:11:22 +00:00
Daniel Nishi
9243dffe47 Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev am: 97ac5c773d
am: ce584ff754

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

Change-Id: I8209c79d73db5259e5f7f9ef4a6ed01dfe14367c
2016-05-24 21:37:24 +00:00
Daniel Nishi
1370f7ed20 Change Downloads to show individual files in the Deletion Helper.
The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.

Bug: 28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005
2016-05-24 14:26:38 -07:00
Daniel Nishi
97ac5c773d Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev 2016-05-24 21:18:39 +00:00
Maurice Lam
ce16ccb792 Merge "Update margins to match specs" into nyc-mr1-dev am: 3b15d6234d
am: 534d856458

* commit '534d85645849a84b122d8a2d1ec7b7bf413ad956':
  Update margins to match specs

Change-Id: Ie74c5f7feeb87a59af630d848ffe3e3d3cfb703e
2016-05-24 01:02:07 +00:00
Maurice Lam
b357e4a81a Update margins to match specs
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
  it won't have a link to show.

Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
2016-05-23 14:51:22 -07: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
Felipe Leme
6af9e6a8b4 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: d21e63fe4b
am: 1d6d3723ba

* commit '1d6d3723bae00d0b6fd3f19dc63b0cb396bbc367':
  Defined help page for Data Saver.

Change-Id: I5061c9969b538ad3e5f08b6ce95ab6d190955866
2016-05-20 22:11:01 +00:00
Felipe Leme
d21e63fe4b Merge "Defined help page for Data Saver." into nyc-dev
am: f8265a8f1e

* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
  Defined help page for Data Saver.

Change-Id: I1430270ab4ac368a6909038ad90816ba67e1d664
2016-05-20 22:06:06 +00:00
Felipe Leme
cf2c0b1b97 Defined help page for Data Saver.
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
2016-05-20 09:08:28 -07:00
Daniel Nishi
bbbdf1fa24 Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev am: ab5a648ddb
am: d7c52d9a99

* commit 'd7c52d9a992fe799cc2206a6a829d4ab57f77f84':
  Add a collapsible checkbox preference for deletion helper.

Change-Id: I63632673593f3f64d53e44425f94d6accec99127
2016-05-20 00:16:36 +00:00
Fan Zhang
f579cf9ae1 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev am: de188186d8
am: 9821904876

* commit '98219048769789a7904c840bf32806cf70f0d56f':
  Display disclaimer dialog before starting support.

Change-Id: Ia973f79f522c627ec2e126a42392d00e5d0e371d
2016-05-20 00:16:29 +00:00
Daniel Nishi
ab5a648ddb Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev 2016-05-19 21:19:02 +00:00
TreeHugger Robot
de188186d8 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev 2016-05-19 20:41:18 +00:00
Fan Zhang
a2bd32b397 Display disclaimer dialog before starting support.
Bug: 28656426
Bug: 28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
2016-05-19 12:15:38 -07:00
Daniel Nishi
a779cd2b16 Add a collapsible checkbox preference for deletion helper.
This adds a custom preference group which has both a checkbox
and collapse/expand behavior. This is intended to be used in
the deletion helper for apps deletion and downloads folder
deletion.

This patch implements the apps deletion integration.

Bug: 28769691
Change-Id: I9fb28a1baa4067841742b5dbeaf2083728c16144
2016-05-19 10:12:59 -07:00
Daniel Nishi
7ad6c44b15 Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev am: 83ff4b06ec
am: d85a19a970

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

Change-Id: I25138268bf7f256f2c4d52b8f083e6e66d721d28
2016-05-19 17:05:15 +00:00
TreeHugger Robot
35a058ce8c Merge "Display total storage for Internal shared storage." 2016-05-18 22:35:27 +00:00