Jason Monk
5ff4935041
Merge \\\"Fix disabling of tiles that are not relevant\\\" into nyc-dev am: 9c5d3164f5 am: 4db5484a9d
...
am: 743ceecbe8
2016-06-08 19:29:44 +00:00
Jason Monk
743ceecbe8
Merge \\"Fix disabling of tiles that are not relevant\\" into nyc-dev am: 9c5d3164f5
...
am: 4db5484a9d
2016-06-08 19:26:17 +00:00
Jason Monk
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
2016-06-08 19:15:41 +00:00
Jason Monk
9c5d3164f5
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
2016-06-08 19:10:09 +00: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
Ricky Wai
9e5b974259
Merge \\\"Make work challenge settings work even work profile is not enabled yet\\\" into nyc-dev am: 68c263cf2e am: 263b210c16
...
am: acb66824a6
2016-06-08 15:06:21 +00:00
Ricky Wai
acb66824a6
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am: 68c263cf2e
...
am: 263b210c16
2016-06-08 14:54:14 +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
Ricky Wai
5f0e81222a
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:49:06 +00:00
Ricky Wai
263b210c16
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:47:43 +00:00
Ricky Wai
68c263cf2e
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
2016-06-08 14:34:02 +00:00
Ricky Wai
7250016447
Make work challenge settings work even work profile is not enabled yet
...
Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
2016-06-08 13:33:57 +00:00
Jim Miller
eab4999c45
Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: f8c64089b1 am: 5b9fab40a0
...
am: d2effc7c01
2016-06-08 00:50:20 +00:00
Jim Miller
d2effc7c01
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: f8c64089b1
...
am: 5b9fab40a0
2016-06-08 00:43:55 +00:00
Jim Miller
6233c1d0bc
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:35 +00:00
Jim Miller
5b9fab40a0
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:29 +00:00
TreeHugger Robot
f8c64089b1
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Ian Rogers
d7b28f70b0
Merge "Fix sort orders on longs."
2016-06-07 15:49:50 +00:00
Ian Rogers
03936cea60
Fix sort orders on longs.
...
The int conversion narrows a long possibly inverting its sign. This may
lead to broken comparator sort orders.
Caught by Error Prone.
Bug: 27723540
Change-Id: I53d70c25a22cdcfc496443395b170f586d259fa7
2016-06-07 00:02:42 -07:00
Robin Lee
971a19b7d3
Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c am: cff703e68a
...
am: dbf70ca4ab
2016-06-06 21:14:59 +00:00
Robin Lee
dbf70ca4ab
Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
...
am: cff703e68a
2016-06-06 21:12:27 +00:00
Robin Lee
e8fce6d433
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
2016-06-06 21:09:30 +00:00
Robin Lee
cff703e68a
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c
Merge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 20:59:01 +00:00
Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00: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
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
Andrew Sapperstein
6c52398695
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
2016-06-03 22:22:38 +00:00
Sudheer Shanka
ea128a798f
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429 am: 7469d799a8
...
am: f23a161d65
2016-06-03 17:36:16 +00:00
Sudheer Shanka
f23a161d65
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am: a433fd2429
...
am: 7469d799a8
2016-06-03 17:24:06 +00:00
Sudheer Shanka
377623b6ee
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:14:43 +00:00
Sudheer Shanka
7469d799a8
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:13:09 +00:00
TreeHugger Robot
a433fd2429
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
2016-06-03 17:02:51 +00:00
Fyodor Kupolov
d4f31e2b8d
Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca am: 06a9c98bb8
...
am: a67010c6f1
2016-06-02 23:00:22 +00:00
Fyodor Kupolov
a67010c6f1
Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca
...
am: 06a9c98bb8
2016-06-02 22:49:41 +00:00
Fyodor Kupolov
a015e6ca16
Merge "Make prefs without an action unselectable" into nyc-dev
...
am: 9121169dca
2016-06-02 22:49:07 +00:00
Fyodor Kupolov
06a9c98bb8
Merge "Make prefs without an action unselectable" into nyc-dev
...
am: 9121169dca
2016-06-02 22:44:44 +00:00
Fyodor Kupolov
9121169dca
Merge "Make prefs without an action unselectable" into nyc-dev
2016-06-02 22:30:22 +00: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
Sudheer Shanka
8b72e563ec
Avoid triggering device admin settings in non-current user.
...
Bug: 28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
2016-06-02 12:40:22 -07:00
Fyodor Kupolov
77865ec827
Make prefs without an action unselectable
...
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug: 29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
2016-06-02 10:39:33 -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
