Commit Graph

40786 Commits

Author SHA1 Message Date
Eric Schwarzenbach
d675c2066a Change network detail page title.
Changes WifiNetworkDetailPage title string from "Network info" to
"Network details" to match the Bluetooth device detail page title.

Bug: 67470790
Test: visual
Change-Id: I7e023f8c8d539c5686a2f95eee3f956f9d5649f1
2017-10-16 09:54:49 -07:00
TreeHugger Robot
bda0d166bb Merge "Move ManageApplications to sub package and remove dead code" 2017-10-12 22:46:43 +00:00
Fan Zhang
a8cac7a409 Move ManageApplications to sub package and remove dead code
Bug: 64804294
Test: rerun test
Change-Id: I23cbd8da9b65f52470030ba3b9b676ece2bada11
2017-10-12 13:48:54 -07:00
Glen Kuhne
c98eee331a Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev am: 85f59ff42d
am: 91aeed6f55

Change-Id: I65d9d59816f9a1b248bfa9bcf7e801260f60bc01
2017-10-12 19:14:50 +00:00
Glen Kuhne
91aeed6f55 Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
am: 85f59ff42d

Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5
2017-10-12 19:02:55 +00:00
TreeHugger Robot
85f59ff42d Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev 2017-10-12 18:54:43 +00:00
TreeHugger Robot
dd1a43ecab Merge "Check system support of wide-color" 2017-10-12 18:37:37 +00:00
Jeffrey Huang
a48e75ae1d Merge "Introduce TransitionAnimationScalePreferenceCtrl" 2017-10-12 16:51:56 +00:00
Courtney Goeltzenleuchter
bae1b24ba3 Check system support of wide-color
getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.

Bug: 64801219
Bug: 67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.

Change-Id: If28e52da174dd460850bc84744818979f52add78
2017-10-12 08:19:01 -06:00
Beverly Tai
f424c3fa90 Merge "Replaced dnd priority setting page w/ behavior." 2017-10-12 13:20:41 +00:00
Jeff Sharkey
89c81e203e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7 am: e9aa79dd1f
am: 25d86653b4  -s ours

Change-Id: I741ec983ea9d4ca96f9c14c645db262c9d3c663f
2017-10-12 02:09:05 +00:00
Jeff Sharkey
8782ed41ec DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41 am: 1ddfd32006
am: dfb5966d0c  -s ours

Change-Id: I2007a6767547fa4ef1e74fd244977852e9889fdb
2017-10-12 02:08:28 +00:00
TreeHugger Robot
d6190b9c7a Merge "Clean up: remove unused code" 2017-10-12 01:49:22 +00:00
Jeff Sharkey
6fd4d538ff DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7 am: 1c4d686b0c
am: 920ca35d48  -s ours

Change-Id: I68137a70607e5b4ddf460d9c326c15804e728d49
2017-10-12 00:05:50 +00:00
Jeff Sharkey
24eef988fb DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41 am: dcd1c0dde1
am: 5477a61da6  -s ours

Change-Id: Icfc98fefed776f7eea3180ae85fb60b0f3b0f682
2017-10-12 00:05:00 +00:00
Bill Yi
2252616ec9 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c43238e7f4 -s ours
am: 448638a650  -s ours

Change-Id: Ice0026e358fd70d6805c2638b4300133b9f2e208
2017-10-12 00:04:06 +00:00
Jeff Sharkey
192a30da7a DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15 am: 91719dc7bd
am: 85a79da59e  -s ours

Change-Id: I22e2d3972fb8aab573f018f7e9b2c783b02e6e37
2017-10-12 00:03:31 +00:00
Jeff Sharkey
a101dea516 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543 am: fb1bd3b2c6
am: cc83075f0e  -s ours

Change-Id: I2be142793c56ee1ac2a914c08eef296543319393
2017-10-12 00:02:51 +00:00
Jeff Sharkey
bc17343e84 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064 am: d563d23d26
am: a9e21a2864  -s ours

Change-Id: Ia2f6ee55e052ca9bf685c5c1606a0101ea0caf95
2017-10-12 00:02:15 +00:00
Fan Zhang
350ccf53f2 Clean up: remove unused code
Bug: 64804294
Test: rerun existing robotests
Change-Id: I5a10cbd8475b74843e4d864eb38105003e98d27e
2017-10-11 16:51:46 -07:00
jeffreyhuang
93c41ba6b5 Introduce TransitionAnimationScalePreferenceCtrl
- Create new TransitionAnimationScalePreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I521561c21cc572f311d3c2699fc877eec693ca3a
2017-10-11 16:43:49 -07:00
TreeHugger Robot
61aba47c87 Merge "Format data usage and data limit consistently." 2017-10-11 23:30:18 +00:00
Jeff Sharkey
25d86653b4 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7
am: e9aa79dd1f

Change-Id: I5b0bd87504fa0843333bdbe01f9d96be3a4dabec
2017-10-11 22:50:08 +00:00
Jeff Sharkey
dfb5966d0c DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41
am: 1ddfd32006

Change-Id: Idcf3281d27502eeebe23e846dc7f3165dd4ada47
2017-10-11 22:48:33 +00:00
Jeff Sharkey
920ca35d48 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34 am: 8b399b3eb7
am: 1c4d686b0c

Change-Id: I2258de70628d91b3e3955391bc5ef999e2865c2d
2017-10-11 22:40:15 +00:00
Jeff Sharkey
5477a61da6 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd am: 9138455b41
am: dcd1c0dde1

Change-Id: Ie97f00549bf2299165f5a32d72feae14fc92b796
2017-10-11 22:38:38 +00:00
Bill Yi
448638a650 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c43238e7f4  -s ours

Change-Id: Idbf4df00a798f85d78e1953745659f09d4290c65
2017-10-11 22:37:09 +00:00
Jeff Sharkey
85a79da59e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15
am: 91719dc7bd

Change-Id: I364e8d1b5239ef75e73236192e48ae936677f6fb
2017-10-11 22:36:31 +00:00
Jeff Sharkey
cc83075f0e DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543
am: fb1bd3b2c6

Change-Id: I395dc28cb99328191e93c2096bfdcb7889e82082
2017-10-11 22:35:01 +00:00
Jeff Sharkey
a9e21a2864 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064
am: d563d23d26

Change-Id: Id82fbbac6455d22623355e0f4c5e24733bd5d6e3
2017-10-11 22:33:45 +00:00
Jeff Sharkey
e9aa79dd1f DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
am: 8b399b3eb7

Change-Id: I29ec2e1b7fdfb6cc28ad011edaea2c2f2377fdf8
2017-10-11 22:25:38 +00:00
Jeff Sharkey
1ddfd32006 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd
am: 9138455b41

Change-Id: I215d463a0b3631384c6963bd8217c912c286f594
2017-10-11 22:23:51 +00:00
Jeff Sharkey
1c4d686b0c DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours am: 952ae3ec34
am: 8b399b3eb7

Change-Id: I42b7d928abb3e1ae71f6e23ddceba969a821f639
2017-10-11 22:19:18 +00:00
Jeff Sharkey
dcd1c0dde1 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours am: 0f53a56cbd
am: 9138455b41

Change-Id: Iaad4be44e1410eac3b0b63d33953bf643d2b3503
2017-10-11 22:17:49 +00:00
TreeHugger Robot
c43238e7f4 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-10-11 22:16:37 +00:00
Jeff Sharkey
8b399b3eb7 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44 am: e803004863 -s ours
am: 952ae3ec34

Change-Id: I40c3ad091c63617baf047a6ce98ad5129d04e7dc
2017-10-11 22:02:29 +00:00
Fan Zhang
cbc4218b9b Format data usage and data limit consistently.
The usage formatter's format flag is change to match data limt flag.

Change-Id: I37d3c8c7bc67a918c793f4799e060010d269834d
Fixes: 63581756
Test: robotests
2017-10-11 15:01:10 -07:00
Jeff Sharkey
9138455b41 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb am: 250d5e60b0 -s ours
am: 0f53a56cbd

Change-Id: I8ee12f143c82b42ca3d06537e1d576577c22c883
2017-10-11 22:00:24 +00:00
Jeff Sharkey
03988b58b3 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15 am: 09112f231c
am: 1c91c0c801  -s ours

Change-Id: Ia80f31671b6416a233a9441df95a8eca00ef4806
2017-10-11 21:55:34 +00:00
Beverly
ad898e6928 Replaced dnd priority setting page w/ behavior.
Bug: 63077372
Test: manual, make -j20 RunSettingsRoboTests
Change-Id: I79fd431da0cbed1407f0dab38e64f0bdb3ff3feb
2017-10-11 17:55:00 -04:00
Jeff Sharkey
c08aea6e80 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21 am: de7c312543 am: c1574a1ef8
am: c2198532bf  -s ours

Change-Id: I1df2f438a20e129ed5d1237b85557fe2d9fd5295
2017-10-11 21:54:43 +00:00
Jeff Sharkey
0a121334b2 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064 am: 8bdd94e292
am: f70906f2da  -s ours

Change-Id: I13c9c64d607d6ab5a4358786c3974c1920a4e679
2017-10-11 21:53:47 +00:00
Fan Zhang
091ebcc923 Merge "Move SettingsRobolectricTestRunner to testutils." am: 16db22a9c8 -s ours am: e39bcb6bf5 -s ours am: eef095d0ee -s ours
am: 78896c40ac  -s ours

Change-Id: I6f0a723c30e1afb2eb6147eba3dd29b060ceb7b1
2017-10-11 21:52:47 +00:00
Jeff Sharkey
91719dc7bd DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05
am: 4d61a1bd15

Change-Id: I7f3fc44f882eed0a435e75cec95c7a03219cc67a
2017-10-11 21:47:52 +00:00
Jeff Sharkey
fb1bd3b2c6 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 1cdc675d7d am: 0bcee25346 am: 46bc2bd7bd -s ours am: b410435a21
am: de7c312543

Change-Id: If4193b75eaccdc612b94af027a8ce6548e613aad
2017-10-11 21:46:44 +00:00
Jeff Sharkey
d563d23d26 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I7a621bcf8afdc1a3cb80e7e57d25adf5f96a17f0
2017-10-11 21:45:11 +00:00
Jeff Sharkey
952ae3ec34 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79 am: 2433b6dc44
am: e803004863  -s ours

Change-Id: If486735b63d2f652bd8d99a01a18f4d5fd8a88bc
2017-10-11 21:42:57 +00:00
Jeff Sharkey
0f53a56cbd DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 019f31b499 am: 556688abdb am: 45926efd0f -s ours am: 89791cb5c3 am: b3d4bc8239 am: 53a69985b3 am: 3aa36a6afb
am: 250d5e60b0  -s ours

Change-Id: I03181b1d378a0f299871cb34551b83aa0fe16dd6
2017-10-11 21:42:14 +00:00
Jeff Sharkey
1c91c0c801 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003 -s ours am: 47bc5fba05 am: 4d61a1bd15
am: 09112f231c

Change-Id: I816186e9a1e6719c88b7121a65071b8dc29981b2
2017-10-11 21:35:26 +00:00
Jeff Sharkey
e803004863 DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 94e678c188 am: e38a7f42ab am: 95bbef26d7 am: ba66bb8a43 -s ours am: 004f90f35e am: 86cc9a681d am: d721694b79
am: 2433b6dc44

Change-Id: I3e2938793111b4b547d4a70ebbf57b8e8f57fd37
2017-10-11 21:34:11 +00:00