Commit Graph

4166 Commits

Author SHA1 Message Date
Julia Reynolds
5a67d5f6f0 DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731
2016-06-14 01:47:05 +00:00
Roozbeh Pournader
a7cb91821a Merge "Make strings for data usage easier to localize" 2016-06-14 00:38:58 +00:00
Doris Ling
827acb4987 Merge \\"Added new setting for gestures.\\" into nyc-mr1-dev am: 8b8a012913
am: 71e6b9a4d9

Change-Id: I03565452928e3f51f8a336cf7358dc63bf447131
2016-06-13 23:17:22 +00:00
Roozbeh Pournader
0761a4bf06 Make strings for data usage easier to localize
The strings were complex to localize, especially since they used
formatting that needed to be carefully reconstructed for cases where
the amount of data appears in the middle of a string. Also, we
already had a localization for file sizes, which we should avoid
redoing, to minimize discrepancies.

Finally, we are now bidi wrapping the usage amount, as it may break
in the RTL locales otherwise, since the RTL locales may be using
Latin abbreviations for gigabyte etc that are LTR.

Since formatting needs to be applied to everything except the number
of units in the amount of data used, and markup should be avoided
since it will confuse bidi wrapping, the code carefully constructs
CharSequence templates that are then decorated with spans after
getting filled in.

Bug: 28747101
Change-Id: I18756b4de99eb551a51fe5e74d1c9cf505551f08
2016-06-13 15:34:00 -07:00
TreeHugger Robot
8b8a012913 Merge "Added new setting for gestures." into nyc-mr1-dev 2016-06-13 22:01:45 +00:00
Doris Ling
9136523a43 Added new setting for gestures.
Added a new entry to the top level Settings' Device section to
enable/disable gestures.

Bug: 28565958

Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
2016-06-13 13:13:21 -07:00
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
b57c55d42c Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am: 86c9894f04

Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35
2016-06-13 17:40:13 +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
bc75397385 Merge \\\"Fix data usage format strings\\\" into nyc-dev am: cb1972b908 am: 2c7e1d844f
am: 9667149282

Change-Id: I2dd2cc37911a466fd92811c37e334d6ef106f440
2016-06-08 19:30:49 +00: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
Andrew Sapperstein
15b78d8f19 Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev am: 9ca09c020e
am: 59358568d0

* commit '59358568d0220dc800cca3ff7633331dfe7e224a':
  Remove the last vestiges of #ff009587.

Change-Id: I3cc323f8b6c98c602f5d934a1d5afb50e82f49d3
2016-05-31 18:46:26 +00:00
Andrew Sapperstein
9ca09c020e Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev 2016-05-31 18:38:07 +00: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
d7efefa503 Merge "Add an automatic storage management job service." into nyc-mr1-dev 2016-05-31 18:25:18 +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
Andrew Sapperstein
517f14f3d8 Remove the last vestiges of #ff009587.
It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.

BUG: 28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6
2016-05-26 17:18:38 -07:00
Maurice Lam
6bdb1be0a0 Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev am: 2016b1acdb
am: 4ba8e6b176

* commit '4ba8e6b176414321952adf9f040d8bad6bff7c63':
  Make fingerprint inherit from GLIF theme

Change-Id: Iebde116725e41401e456c8ab24b2925268ef53a3
2016-05-26 19:02:37 +00:00
Maurice Lam
2016b1acdb Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev 2016-05-26 18:54:02 +00:00
Maurice Lam
b75baac925 Make fingerprint inherit from GLIF theme
Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.

There should be no visual change other than the fixed margins.

Bug: 28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5
2016-05-26 00:22:36 +00:00
Sunny Goyal
9588e9bd50 Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev am: 60a4dc652d
am: a635c735ea

* commit 'a635c735eaba545ef428ff76d9d4a50303bb4331':
  Add an option allowing to skip wallpaper apps selection.

Change-Id: I8a2bae00cdf82dedacb492c6c0eee3f72251ac33
2016-05-25 23:27:24 +00:00
Sunny Goyal
60a4dc652d Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev 2016-05-25 22:50:43 +00:00
Sunny Goyal
d41d829dd5 Merge "Revert "Add an option allowing to skip wallpaper apps selection."" 2016-05-25 22:50:36 +00:00
Sunny Goyal
1598d73c12 Revert "Add an option allowing to skip wallpaper apps selection."
This reverts commit fe4e80b98b.

This change is covered in https://googleplex-android-review.git.corp.google.com/#/c/1075489/

Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244
2016-05-25 21:08:47 +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