Felipe Leme
a889cf761c
Removed unused string (high_power_count).
...
Change-Id: I3ababf4fd0c7f4ae9c9a64a3cf05d5a9db291cba
Fixes: 29220742
2016-06-08 16:50:51 -07:00
Doris Ling
49f9e9828d
Merge \"Merge \\"Moved network settings reset away from Backup & reset.\\" into nyc-mr1-dev am: ab595b8a98\" into nyc-mr1-dev-plus-aosp
...
am: a8272ec495
2016-06-08 21:42:37 +00:00
Doris Ling
be2847ec3b
Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev
...
am: ab595b8a98
2016-06-08 21:39:46 +00:00
Doris Ling
ab595b8a98
Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev
2016-06-08 21:35:20 +00: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
4a8b16323b
resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp
...
am: 84f544a2ae
2016-06-08 19:34:31 +00:00
Jason Monk
bc75397385
Merge \\\"Fix data usage format strings\\\" into nyc-dev am: cb1972b908 am: 2c7e1d844f
...
am: 9667149282
2016-06-08 19:30:49 +00: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
9667149282
Merge \\"Fix data usage format strings\\" into nyc-dev am: cb1972b908
...
am: 2c7e1d844f
2016-06-08 19:26:48 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f
Merge \"Fix data usage format strings\" into nyc-dev
...
am: cb1972b908
2016-06-08 19:15:42 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
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
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
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
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
2016-06-03 23:29:53 +00:00
Jason Monk
f7d775c3d6
Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
...
am: 8a1d371239
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
2016-06-03 22:21:47 +00:00
Jason Monk
2cd2074f7f
Merge "Fix accidental non-translatable string" into nyc-dev
...
am: 8c5dccc6bf
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
2016-06-03 15:51:17 +00:00
Makoto Onuki
26db302e41
Fix RTL layout am: 3a87050921
...
am: a8a8167ebb
2016-06-03 15:42:45 +00:00
Makoto Onuki
a8a8167ebb
Fix RTL layout
...
am: 3a87050921
2016-06-03 15:33:57 +00:00
Makoto Onuki
622992625f
Fix RTL layout
...
am: 3a87050921
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
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
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
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
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
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
