Commit Graph

10053 Commits

Author SHA1 Message Date
Jason Monk
cb1972b908 Merge "Fix data usage format strings" into nyc-dev 2016-06-08 19:11:51 +00:00
Doris Ling
e6f635ff82 Moved network settings reset away from Backup & reset.
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.

Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
2016-06-08 11:49:47 -07: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
TreeHugger Robot
d4e31320c1 Merge "Display total storage for Internal shared storage." into nyc-mr1-dev 2016-06-08 16:08:11 +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
Baligh Uddin
013581c95e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
2016-06-07 21:21:26 -07:00
Bill Yi
937c29d240 Import translations. DO NOT MERGE
Change-Id: Ife628ac799a79648619b9d52df5ec0da1287281d
Auto-generated-cl: translation import
2016-06-06 19:03:01 -07:00
Bill Yi
d4bd56b2a7 Import translations. DO NOT MERGE
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
2016-06-06 18:48:05 -07:00
Bill Yi
fad556056d Import translations. DO NOT MERGE
Change-Id: I8cb13150fc08e94cd42c7426695b694ec5eda94f
Auto-generated-cl: translation import
2016-06-06 18:06:54 -07: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
66fb65b867 Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
am: 6c52398695

* commit '6c52398695164aeba6c3ad8ebc8047ffe98805df':
  Add safety & regulatory info to "about device".

Change-Id: I7feb228f842a1697c2e3c56bfb6c1dcb0694c9b5
2016-06-03 23:29:53 +00:00
Jason Monk
f7d775c3d6 Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
am: 8a1d371239

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

Change-Id: Ic637ea0a09b49d250b80690094a5cd21ba31d236
2016-06-03 23:29:51 +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
2cd2074f7f Merge "Fix accidental non-translatable string" into nyc-dev
am: 8c5dccc6bf

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

Change-Id: I27dbea3833ed4e8c491a26da676da4b4e02696ca
2016-06-03 21:06:10 +00:00
TreeHugger Robot
edafefc1ed Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-03 19:22:57 +00:00
TreeHugger Robot
6c3dac1f89 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-03 19:18:31 +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
Bill Yi
ed57d2f783 Import translations. DO NOT MERGE
Change-Id: Ief4e4adccef8f8a438e629d07e3129f3441293b6
Auto-generated-cl: translation import
2016-06-03 10:43:44 -07:00
Bill Yi
73642fd30c Import translations. DO NOT MERGE
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
2016-06-03 10:09:43 -07:00
Makoto Onuki
4a63a83c55 Fix RTL layout am: 3a87050921 am: a8a8167ebb
am: 26db302e41

* commit '26db302e4129c58e684a0a1c1408464e383eae43':
  Fix RTL layout

Change-Id: I92c733ca40c99c4203f176c2c7a5bacf65c74071
2016-06-03 15:51:17 +00:00
Makoto Onuki
26db302e41 Fix RTL layout am: 3a87050921
am: a8a8167ebb

* commit 'a8a8167ebb0f89962fbe31aa77e3af2aa50258ec':
  Fix RTL layout

Change-Id: Ifdcaf3aefbcb0e143960d6cdbb184a2f285de343
2016-06-03 15:42:45 +00:00
Makoto Onuki
a8a8167ebb Fix RTL layout
am: 3a87050921

* commit '3a87050921f78e0882893bc343e49b8bb1b34975':
  Fix RTL layout

Change-Id: Ic758b78742843261a92f9f87bc2f602223955e8e
2016-06-03 15:33:57 +00:00
Makoto Onuki
622992625f Fix RTL layout
am: 3a87050921

* commit '3a87050921f78e0882893bc343e49b8bb1b34975':
  Fix RTL layout

Change-Id: Ia43ea6cb762de491564ed442d3751c2887d85735
2016-06-03 15:33:52 +00:00
Makoto Onuki
3a87050921 Fix RTL layout
Bug 29072224

Change-Id: I414d868b4256e034850a873511bf34d9430842dc
2016-06-02 17:52:17 -07: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
704476a96d 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: I894e3bf6602adfb539b795e00f23d369dcb66251
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
TreeHugger Robot
ef64a8f89d Merge "Import translations. DO NOT MERGE" 2016-06-01 15:18:37 +00:00
TreeHugger Robot
fb9e8e3188 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-01 15:14:12 +00:00
TreeHugger Robot
da38e871de Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-01 15:12:42 +00:00
Bill Yi
d3cf866b7c Import translations. DO NOT MERGE
Change-Id: I6e36edcd4fa922050390eb4f0e934b910b0a33c6
Auto-generated-cl: translation import
2016-06-01 06:40:08 -07:00
Bill Yi
824b1f09f7 Import translations. DO NOT MERGE
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
2016-06-01 06:23:22 -07:00
Bill Yi
177eb426c1 Import translations. DO NOT MERGE
Change-Id: Ie52cf27f9003c53990a2ac475b59ffdb18add7aa
Auto-generated-cl: translation import
2016-06-01 05:34:58 -07:00
Tony Mak
94f187e0b4 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156 am: caeb93ceda
am: 2abfd032d5

* commit '2abfd032d5ed250981d02dfd2746f450c0b65631':
  Fix RTL issue in Trusted Credentail page

Change-Id: I5ad04475a651a885ae2228efb6cf10be56133864
2016-06-01 09:52:48 +00:00
Tony Mak
2abfd032d5 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156
am: caeb93ceda

* commit 'caeb93ceda8bb07c015025a00714241a78a42976':
  Fix RTL issue in Trusted Credentail page

Change-Id: I603af8b3455cba99ee8bde3c9dce805b59c10c51
2016-06-01 09:48:27 +00:00
Tony Mak
caeb93ceda Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: Ib91896687a2c5297ae9f1454b0b7729e2dd670a7
2016-06-01 09:44:06 +00:00
Tony Mak
0b86c6bcc6 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: I0d5504ccca59ee03b7ad8efbd26128f394721b82
2016-06-01 09:44:06 +00:00
Tony Mak
ffb10f8156 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 2016-06-01 09:36:51 +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
0500f2bede Launch E911 address management activity at turning on Wifi Calling
am: 90e8e4713c

* commit '90e8e4713c7710f765868ed90f69e2424eb19fe5':
  Launch E911 address management activity at turning on Wifi Calling

Change-Id: Ie526f9a5c0d6f66c5e8c79c6ac3299a4aa5a4db6
2016-06-01 00:46:33 +00:00