OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Respect user's choice on a11y shortcut dialog" into oc-dev am: d4ce883c64
Phil Weaver [Wed, 19 Apr 2017 16:16:14 +0000 (16:16 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev am: d4ce883c64
am: 8a3d606a60

Change-Id: Id39f650645400b4e5076ea0a9cd86925244e76d5

7 years agoMerge "Respect user's choice on a11y shortcut dialog" into oc-dev
Phil Weaver [Wed, 19 Apr 2017 16:14:47 +0000 (16:14 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
am: d4ce883c64

Change-Id: I82abeb908dee28948443c05adadc96ba2ca2bea6

7 years agoMerge "Respect user's choice on a11y shortcut dialog" into oc-dev
Phil Weaver [Wed, 19 Apr 2017 16:09:15 +0000 (16:09 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev

7 years agoMerge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev...
Kevin Chyn [Wed, 19 Apr 2017 08:15:20 +0000 (08:15 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev am: eb62407114
am: 98a7794b13

Change-Id: I11f9e5996109f7f5698c389f3a1b0cac63cf2ef6

7 years agoMerge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
Kevin Chyn [Wed, 19 Apr 2017 08:13:20 +0000 (08:13 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
am: eb62407114

Change-Id: I720cf3554c54cedfb674e93c552f45ab368734a9

7 years agoMerge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 08:07:53 +0000 (08:07 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev

7 years agoMerge "Using a common class for loading drawables and handling various badging" into...
Sunny Goyal [Wed, 19 Apr 2017 03:03:50 +0000 (03:03 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8
am: 77fca989a0

Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2

7 years agoMerge "Using a common class for loading drawables and handling various badging" into...
Sunny Goyal [Wed, 19 Apr 2017 02:53:17 +0000 (02:53 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
am: d2561263a8

Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96

7 years agoMerge "Using a common class for loading drawables and handling various badging" into...
TreeHugger Robot [Wed, 19 Apr 2017 02:43:40 +0000 (02:43 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev

7 years agoMerge "Remove animations in WifiSettings." into oc-dev am: 36a3579c61
Sundeep Ghuman [Wed, 19 Apr 2017 02:24:29 +0000 (02:24 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev am: 36a3579c61
am: 56de2b521a

Change-Id: I17c5421fc80d5a888355d5e1f69f30cea09dc0fd

7 years agoMerge "Remove animations in WifiSettings." into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 02:22:28 +0000 (02:22 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev
am: 36a3579c61

Change-Id: I9c0a79d1caed78275e728fc454a97b4124f1da1e

7 years agoMerge "Remove animations in WifiSettings." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 02:17:31 +0000 (02:17 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev

7 years agoMerge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336
Fan Zhang [Wed, 19 Apr 2017 01:54:40 +0000 (01:54 +0000)]
Merge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336
am: 2bb10c9e57

Change-Id: I9d58c7ee1154c640e570627477e97ffaeb68777f

7 years agoMerge "Add test to verify regulatory info launches properly" into oc-dev
Fan Zhang [Wed, 19 Apr 2017 01:52:26 +0000 (01:52 +0000)]
Merge "Add test to verify regulatory info launches properly" into oc-dev
am: 4766183336

Change-Id: Idac77bcc7377dd55169f817d39eea52fc757f135

7 years agoMerge "Add test to verify regulatory info launches properly" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 01:48:39 +0000 (01:48 +0000)]
Merge "Add test to verify regulatory info launches properly" into oc-dev

7 years agoMerge "IPv6 addresses should not be selectable." into oc-dev am: 4ae52fc7f0
Sundeep Ghuman [Wed, 19 Apr 2017 01:11:46 +0000 (01:11 +0000)]
Merge "IPv6 addresses should not be selectable." into oc-dev am: 4ae52fc7f0
am: 1e04aa912e

Change-Id: I18c6a34b45138e348cb67cc2500cdf662d712784

7 years agoMerge "IPv6 addresses should not be selectable." into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 01:05:34 +0000 (01:05 +0000)]
Merge "IPv6 addresses should not be selectable." into oc-dev
am: 4ae52fc7f0

Change-Id: Ia5943ec8c4c1630ea35b99c1057c0b50cde1d581

7 years agoMerge "IPv6 addresses should not be selectable." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 00:54:32 +0000 (00:54 +0000)]
Merge "IPv6 addresses should not be selectable." into oc-dev

7 years agoRespect user's choice on a11y shortcut dialog
Phil Weaver [Wed, 19 Apr 2017 00:53:14 +0000 (17:53 -0700)]
Respect user's choice on a11y shortcut dialog

Wasn't checking if the user actually agreed. Whoops.

Bug: 37123004
Test: Manually verified that canceling leaves the selection
unchanged.

Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5

7 years agoRemove animations in WifiSettings.
Sundeep Ghuman [Tue, 18 Apr 2017 22:41:38 +0000 (15:41 -0700)]
Remove animations in WifiSettings.

This addresses jank issues when first showing the WifiSettings. Given
the new loading bar, animated transitions seem less relevant. Based on
user feedback, animations may be readded after a delay in ODR.

Bug: b/37429702
Test: Visual
Change-Id: I9a44820bb354885d0ef31d50278aee6a47727701

7 years agoIPv6 addresses should not be selectable.
Sundeep Ghuman [Mon, 17 Apr 2017 21:42:21 +0000 (14:42 -0700)]
IPv6 addresses should not be selectable.

Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.

Bug: b/37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0

7 years agoMerge "Conditionally reposition experimental preferences." into oc-dev am: b18e31bc5a
Saige McVea [Tue, 18 Apr 2017 22:00:48 +0000 (22:00 +0000)]
Merge "Conditionally reposition experimental preferences." into oc-dev am: b18e31bc5a
am: f869788eb8

Change-Id: I6346767b427cd4d3711251b841afa62863db8bfe

7 years agoMerge "Listen to brigtness updates to update brightness summary." into oc-dev am...
Doris Ling [Tue, 18 Apr 2017 22:00:34 +0000 (22:00 +0000)]
Merge "Listen to brigtness updates to update brightness summary." into oc-dev am: a88635f5a3
am: 96840d4010  -s ours

Change-Id: I1511f985e8e06a1496a1070404808b59ac14d4a4

7 years agoMerge "Conditionally reposition experimental preferences." into oc-dev
Saige McVea [Tue, 18 Apr 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Conditionally reposition experimental preferences." into oc-dev
am: b18e31bc5a

Change-Id: I072311948f0ff2abac3569330ae678da5b5d5ce0

7 years agoMerge "Listen to brigtness updates to update brightness summary." into oc-dev
Doris Ling [Tue, 18 Apr 2017 21:54:23 +0000 (21:54 +0000)]
Merge "Listen to brigtness updates to update brightness summary." into oc-dev
am: a88635f5a3

Change-Id: Ida6ea12152be71e3319479ea73116c68082652b1

7 years agoMerge "Conditionally reposition experimental preferences." into oc-dev
Saige McVea [Tue, 18 Apr 2017 21:47:25 +0000 (21:47 +0000)]
Merge "Conditionally reposition experimental preferences." into oc-dev

7 years agoMerge "Listen to brigtness updates to update brightness summary." into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 21:47:05 +0000 (21:47 +0000)]
Merge "Listen to brigtness updates to update brightness summary." into oc-dev

7 years agoUsing a common class for loading drawables and handling various badging
Sunny Goyal [Wed, 12 Apr 2017 22:53:30 +0000 (15:53 -0700)]
Using a common class for loading drawables and handling various badging

Test: make RunSettingsRoboTests -j31
Bug: 36591157

Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e

7 years agoMerge "In apps with no channels, provide settings for misc channel in top level....
Alison Cichowlas [Tue, 18 Apr 2017 20:54:59 +0000 (20:54 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev am: cf172040a9
am: 2d8a676b47

Change-Id: I25d7f8ad2a4acca731aa29b9a97bb64feb8e3a98

7 years agoMerge "In apps with no channels, provide settings for misc channel in top level....
Alison Cichowlas [Tue, 18 Apr 2017 20:49:52 +0000 (20:49 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
am: cf172040a9

Change-Id: I590ad5b3f2ef6fd5b578e9bdc37d1999d3091a77

7 years agoMerge "In apps with no channels, provide settings for misc channel in top level....
Alison Cichowlas [Tue, 18 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev

7 years agoListen to brigtness updates to update brightness summary.
Doris Ling [Thu, 13 Apr 2017 22:06:36 +0000 (15:06 -0700)]
Listen to brigtness updates to update brightness summary.

- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix: 37227609
Test: make RunSettingsRoboTests

7 years agoAdd test to verify regulatory info launches properly
Fan Zhang [Tue, 18 Apr 2017 19:06:11 +0000 (12:06 -0700)]
Add test to verify regulatory info launches properly

Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix: 34370866

7 years agoMerge "Update Setup Wizard Vision Settings colors." into oc-dev am: 221f9245d6
Anna Galusza [Tue, 18 Apr 2017 19:48:03 +0000 (19:48 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev am: 221f9245d6
am: 86d10d65ab

Change-Id: I2e1a87c187bf9182b028402ae01d3504e5a637de

7 years agoMerge "Listen to brigtness updates to update brightness summary."
TreeHugger Robot [Tue, 18 Apr 2017 19:47:35 +0000 (19:47 +0000)]
Merge "Listen to brigtness updates to update brightness summary."

7 years agoMerge "Update Setup Wizard Vision Settings colors." into oc-dev
Anna Galusza [Tue, 18 Apr 2017 19:42:39 +0000 (19:42 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
am: 221f9245d6

Change-Id: If4075343e65cf000452324ad04ed6fb5f26ab774

7 years agoMerge "Update Setup Wizard Vision Settings colors." into oc-dev
Anna Galusza [Tue, 18 Apr 2017 19:35:05 +0000 (19:35 +0000)]
Merge "Update Setup Wizard Vision Settings colors." into oc-dev

7 years agoIn apps with no channels, provide settings for misc channel in top level.
Alison Cichowlas [Mon, 17 Apr 2017 19:50:29 +0000 (15:50 -0400)]
In apps with no channels, provide settings for misc channel in top level.

Test: robolectric tests pass, plus manual verification
Bug: 36561295

Change-Id: I58872a41fab562787d85bade0552c7735d716e5b

7 years agoListen to brigtness updates to update brightness summary.
Doris Ling [Thu, 13 Apr 2017 22:06:36 +0000 (15:06 -0700)]
Listen to brigtness updates to update brightness summary.

- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Bug: 37227609
Test: make RunSettingsRoboTests
Change-Id: I895d251e1dc12cb114ef00328eb8aa0075d77ab1

7 years agoMerge "Revert "Add summary to special app access."" into oc-dev am: 4fa0a617ec
Matthew Fritze [Tue, 18 Apr 2017 17:51:26 +0000 (17:51 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev am: 4fa0a617ec
am: d9997261dd

Change-Id: Ie13c5b63e82edff9f0d442a29ebcc626c7e37f79

7 years agoMerge "Revert "Add summary to special app access."" into oc-dev
Matthew Fritze [Tue, 18 Apr 2017 17:44:57 +0000 (17:44 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev
am: 4fa0a617ec

Change-Id: I7353685f51f4ff287b58e382bd87e9ad22f16783

7 years agoMerge "Revert "Add summary to special app access."" into oc-dev
Matthew Fritze [Tue, 18 Apr 2017 17:39:12 +0000 (17:39 +0000)]
Merge "Revert "Add summary to special app access."" into oc-dev

7 years agoRevert "Add summary to special app access."
Matthew Fritze [Tue, 18 Apr 2017 17:35:07 +0000 (17:35 +0000)]
Revert "Add summary to special app access."

This reverts commit 0e1b53fa6fda4382e4430492679cb7543f1cb510.

Change-Id: Ica5a9f7f40be3a4c2ae0e999d9832717dc44f3b5

7 years agoMerge "Channel settings updates" into oc-dev am: 526185c89b
Julia Reynolds [Tue, 18 Apr 2017 15:16:56 +0000 (15:16 +0000)]
Merge "Channel settings updates" into oc-dev am: 526185c89b
am: 41b21fd2d5

Change-Id: I6199301c1de2fb0f4e2229a9dcc745b4efe3a576

7 years agoMerge "Channel settings updates" into oc-dev
Julia Reynolds [Tue, 18 Apr 2017 15:11:27 +0000 (15:11 +0000)]
Merge "Channel settings updates" into oc-dev
am: 526185c89b

Change-Id: Ibb9cb726d26579ce94f26e18d00bcca73061b9e6

7 years agoMerge "Channel settings updates" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Channel settings updates" into oc-dev

7 years agoMerge "Hide User category if only one user in device" into oc-dev am: 55a3944dbf
jackqdyulei [Tue, 18 Apr 2017 03:37:20 +0000 (03:37 +0000)]
Merge "Hide User category if only one user in device" into oc-dev am: 55a3944dbf
am: b5dafb6c10

Change-Id: I9dd993c03395565cf5b3355e60a568eed08c7857

7 years agoMerge "Hide User category if only one user in device" into oc-dev
jackqdyulei [Tue, 18 Apr 2017 03:31:44 +0000 (03:31 +0000)]
Merge "Hide User category if only one user in device" into oc-dev
am: 55a3944dbf

Change-Id: I8a799188f0fe64952386c178eb3f303615fa13ef

7 years agoMerge "Don't show Screen as Apps in advanced battery page" into oc-dev am: 89bc5b2bff
Lei Yu [Tue, 18 Apr 2017 03:31:34 +0000 (03:31 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev am: 89bc5b2bff
am: 4f016eeb6b

Change-Id: I6524ea22d71d4d7acd6186ebdb62de3cdd89a87d

7 years agoSticky footer for GLIF theme am: 667d694220
Maurice Lam [Tue, 18 Apr 2017 03:31:16 +0000 (03:31 +0000)]
Sticky footer for GLIF theme am: 667d694220
am: 1b852af477

Change-Id: I7f0803649ff42bba2edbf606f69e935662674b31

7 years agoMerge "Use buttons for EncryptionInterstitial" into oc-dev am: b6a0360a92
Maurice Lam [Tue, 18 Apr 2017 03:30:59 +0000 (03:30 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev am: b6a0360a92
am: 62c5a2c357  -s ours

Change-Id: I37dc909344499be84f5cd3018e2aee092547066c

7 years agoMerge "Hide User category if only one user in device" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 03:21:54 +0000 (03:21 +0000)]
Merge "Hide User category if only one user in device" into oc-dev

7 years agoMerge "Hide "Magnify with button" if no navbar is shown" into oc-dev am: 65523b9cb0
Casey Burkhardt [Tue, 18 Apr 2017 02:50:09 +0000 (02:50 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev am: 65523b9cb0
am: 855391b66f

Change-Id: Id976a6a4c502dbe8624e810587555869588f3264

7 years agoMerge "Consolidate notification settings." into oc-dev am: 6adf04c741
Julia Reynolds [Tue, 18 Apr 2017 02:03:01 +0000 (02:03 +0000)]
Merge "Consolidate notification settings." into oc-dev am: 6adf04c741
am: bcaa8ecb24

Change-Id: Id632a07d66080acb4368c1789ce829ff8898b378

7 years agoMerge "Don't show Screen as Apps in advanced battery page" into oc-dev
Lei Yu [Tue, 18 Apr 2017 01:08:19 +0000 (01:08 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev
am: 89bc5b2bff

Change-Id: I1058418e9df7965046a6387594c60fb3e8fad629

7 years agoSticky footer for GLIF theme
Maurice Lam [Tue, 18 Apr 2017 01:02:00 +0000 (01:02 +0000)]
Sticky footer for GLIF theme
am: 667d694220

Change-Id: I9c91b27cc38fbb9839f62cac91901dac2dd2698d

7 years agoMerge "Use buttons for EncryptionInterstitial" into oc-dev
Maurice Lam [Tue, 18 Apr 2017 01:01:43 +0000 (01:01 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev
am: b6a0360a92

Change-Id: I07ac891f736ba3707b01b629732df4a963ab64cc

7 years agoHide User category if only one user in device
jackqdyulei [Mon, 17 Apr 2017 21:54:29 +0000 (14:54 -0700)]
Hide User category if only one user in device

Fix: 37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d

7 years agoMerge "Don't show Screen as Apps in advanced battery page" into oc-dev
Lei Yu [Tue, 18 Apr 2017 00:56:10 +0000 (00:56 +0000)]
Merge "Don't show Screen as Apps in advanced battery page" into oc-dev

7 years agoSticky footer for GLIF theme
Maurice Lam [Thu, 30 Mar 2017 04:10:15 +0000 (21:10 -0700)]
Sticky footer for GLIF theme

For settings screens using GLIF theme, update to sticky footers.

Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
(cherry picked from commit a857c8da4fcac98e70ea0d8d5b108aff24561341)

7 years agoMerge "Use buttons for EncryptionInterstitial" into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 00:32:55 +0000 (00:32 +0000)]
Merge "Use buttons for EncryptionInterstitial" into oc-dev

7 years agoMerge "Hide "Magnify with button" if no navbar is shown" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 00:21:04 +0000 (00:21 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
am: 65523b9cb0

Change-Id: I981cbc677a5b1b000c6734fc8f12d4af681f4268

7 years agoMerge "Fix startup jank in the Wifi Picker." into oc-dev am: ceedf2b9bf
Sundeep Ghuman [Tue, 18 Apr 2017 00:13:51 +0000 (00:13 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev am: ceedf2b9bf
am: 8b8f65828b

Change-Id: I19dcf41102818c59c1976b48082e02c1f57099e7

7 years agoMerge "Hide "Magnify with button" if no navbar is shown" into oc-dev
Casey Burkhardt [Tue, 18 Apr 2017 00:06:52 +0000 (00:06 +0000)]
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev

7 years agoMerge "Follow storage API polishing." into oc-dev am: e398a84199
Jeff Sharkey [Mon, 17 Apr 2017 23:58:17 +0000 (23:58 +0000)]
Merge "Follow storage API polishing." into oc-dev am: e398a84199
am: 4ecbc32b48

Change-Id: Ie47474e46fa6ebfffdddad04ab8c99b332c4f8cc

7 years agoMerge "Consolidate notification settings." into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 23:24:54 +0000 (23:24 +0000)]
Merge "Consolidate notification settings." into oc-dev
am: 6adf04c741

Change-Id: I255c258c6defed91fea42ab70ed8ff2019f271f1

7 years agoMerge "Consolidate notification settings." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 23:16:31 +0000 (23:16 +0000)]
Merge "Consolidate notification settings." into oc-dev

7 years agoMerge "Fix startup jank in the Wifi Picker." into oc-dev
Sundeep Ghuman [Mon, 17 Apr 2017 22:52:47 +0000 (22:52 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev
am: ceedf2b9bf

Change-Id: I231adc5f06c20bf6b95db63a8e2ee145d23b9403

7 years agoMerge "Update the old Storage view to look better." into oc-dev am: 427f976ff4
Daniel Nishi [Mon, 17 Apr 2017 22:50:07 +0000 (22:50 +0000)]
Merge "Update the old Storage view to look better." into oc-dev am: 427f976ff4
am: c99803bba4

Change-Id: Ibe8619a285effba38e89e2fada0887c57be54108

7 years agoMerge "Fix a bug where options menu was not showing." into oc-dev am: 4f2f6bcad9
Daniel Nishi [Mon, 17 Apr 2017 22:49:45 +0000 (22:49 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev am: 4f2f6bcad9
am: e69e9d74c5

Change-Id: Ica70e9cc82bdb8eb745583a3558f6fbb1f7c1b18

7 years agoMerge "Fix startup jank in the Wifi Picker." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Fix startup jank in the Wifi Picker." into oc-dev

7 years agoUse buttons for EncryptionInterstitial
Maurice Lam [Thu, 23 Feb 2017 22:43:48 +0000 (14:43 -0800)]
Use buttons for EncryptionInterstitial

Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb1e12e5068f2672dfbb9baa0051d604)

7 years agoMerge "Follow storage API polishing." into oc-dev
Jeff Sharkey [Mon, 17 Apr 2017 22:40:20 +0000 (22:40 +0000)]
Merge "Follow storage API polishing." into oc-dev
am: e398a84199

Change-Id: Iad89fac67061de273b88f5d3e384de0349577e57

7 years agoMerge "Update the old Storage view to look better." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:39:52 +0000 (22:39 +0000)]
Merge "Update the old Storage view to look better." into oc-dev
am: 427f976ff4

Change-Id: Ice0e3cb73a4d0b3ea81e83107f3f6084e83b5554

7 years agoMerge "Fix a bug where options menu was not showing." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:39:31 +0000 (22:39 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev
am: 4f2f6bcad9

Change-Id: I9bfa738b7d7010955ea26b162573bdb68dbbcef5

7 years agoMerge "Make battery status refresh in SettingsActivity" into oc-dev am: 3a156f5509
jackqdyulei [Mon, 17 Apr 2017 22:33:26 +0000 (22:33 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev am: 3a156f5509
am: d5178f2bf0

Change-Id: I5dcae2cec079ba86f2052cd95bc0fb08e39b12a7

7 years agoMerge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
Fan Zhang [Mon, 17 Apr 2017 22:33:08 +0000 (22:33 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
am: d96ce57713

Change-Id: I50bb90a53c74960465c73aafc8ae5ee0e8021b50

7 years agoMerge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc...
Sarah Fortune [Mon, 17 Apr 2017 22:32:52 +0000 (22:32 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am: f7896f491a
am: 9827007c5e

Change-Id: Ib5db637dd6a7a79f622a11f737bbae08a3d557e1

7 years agoMerge "Disable SetupRedactionInterstitial when complete" into oc-dev am: 3265c25861
Maurice Lam [Mon, 17 Apr 2017 22:32:35 +0000 (22:32 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev am: 3265c25861
am: cd22ea50ca

Change-Id: I1423175ee2027939f67f9d33c22a9c4a8ea57da8

7 years agoMerge "Add summary to special app access." into oc-dev am: 43458f0249
Doris Ling [Mon, 17 Apr 2017 22:32:18 +0000 (22:32 +0000)]
Merge "Add summary to special app access." into oc-dev am: 43458f0249
am: edbcea5a14

Change-Id: I902bb0bf99198fe922268222c20dfa34d5e49433

7 years agoMerge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am: c2d56691fe
Christine Franks [Mon, 17 Apr 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am: c2d56691fe
am: f0320dd7aa

Change-Id: I7f4624486a8299c7e36b3eb97167795a2f5da380

7 years agoMerge "Follow storage API polishing." into oc-dev
Jeff Sharkey [Mon, 17 Apr 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Follow storage API polishing." into oc-dev

7 years agoMerge "Update the old Storage view to look better." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:26:10 +0000 (22:26 +0000)]
Merge "Update the old Storage view to look better." into oc-dev

7 years agoMerge "Fix a bug where options menu was not showing." into oc-dev
Daniel Nishi [Mon, 17 Apr 2017 22:25:52 +0000 (22:25 +0000)]
Merge "Fix a bug where options menu was not showing." into oc-dev

7 years agoMerge "Make battery status refresh in SettingsActivity" into oc-dev
jackqdyulei [Mon, 17 Apr 2017 22:00:25 +0000 (22:00 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev
am: 3a156f5509

Change-Id: I4706f49e9f8cce14fd98da167a8d05b4ba4a4519

7 years agoMerge "Make battery status refresh in SettingsActivity" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 21:53:56 +0000 (21:53 +0000)]
Merge "Make battery status refresh in SettingsActivity" into oc-dev

7 years agoUpdate action bar style in app header UI. am: be6fab0135
Fan Zhang [Mon, 17 Apr 2017 21:37:24 +0000 (21:37 +0000)]
Update action bar style in app header UI. am: be6fab0135
am: 00a0978293

Change-Id: I4d4029d732602dd515249d344e5edc597b858a54

7 years agoConsolidate notification settings.
Julia Reynolds [Mon, 17 Apr 2017 21:22:09 +0000 (17:22 -0400)]
Consolidate notification settings.

App notifications now appears under configure notifications.

Bug: 36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86

7 years agoMerge "Use standard preference layout for wallpaper picker" into oc-dev
Fan Zhang [Mon, 17 Apr 2017 21:18:14 +0000 (21:18 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev
am: 8e1d588cdf

Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89

7 years agoMerge "Use standard preference layout for wallpaper picker" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 21:10:30 +0000 (21:10 +0000)]
Merge "Use standard preference layout for wallpaper picker" into oc-dev

7 years agoFix startup jank in the Wifi Picker.
Sundeep Ghuman [Thu, 13 Apr 2017 23:11:18 +0000 (16:11 -0700)]
Fix startup jank in the Wifi Picker.

Synchronously fetch the latest APs during onResume and show these before
displaying the other wifi preferences. This fixes a visibile shuffling
issue. Additional Setting preferences are now programatically added
during onStart and hidden during onStop in order to avoid the animation
delay which causes a shuffling effect.

Bug: b/36406983
Test: Visual inspection. Animation jank is difficult to programatically
test.

Change-Id: I34b2d737a8e72e1dc296c170f753975fafce7a3e

7 years agoFollow storage API polishing.
Jeff Sharkey [Mon, 17 Apr 2017 15:31:33 +0000 (09:31 -0600)]
Follow storage API polishing.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 373259233581289935806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d

7 years agoMerge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
Sarah Fortune [Mon, 17 Apr 2017 20:15:45 +0000 (20:15 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
am: f7896f491a

Change-Id: I66a108fd9b767a9060c22feb39c928a196fdfe07

7 years agoMerge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
Sarah Fortune [Mon, 17 Apr 2017 20:07:31 +0000 (20:07 +0000)]
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev

7 years agoMerge "Finalize the string for eSIM factory reset."
TreeHugger Robot [Mon, 17 Apr 2017 19:50:14 +0000 (19:50 +0000)]
Merge "Finalize the string for eSIM factory reset."

7 years agoMerge "Disable SetupRedactionInterstitial when complete" into oc-dev
Maurice Lam [Mon, 17 Apr 2017 19:46:44 +0000 (19:46 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
am: 3265c25861

Change-Id: I0a9554576451b4f217fe8180ffe6812c9b4ac7c4

7 years agoMerge "Disable SetupRedactionInterstitial when complete" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:43:13 +0000 (19:43 +0000)]
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev

7 years agoMerge "Add summary to special app access." into oc-dev
Doris Ling [Mon, 17 Apr 2017 19:42:15 +0000 (19:42 +0000)]
Merge "Add summary to special app access." into oc-dev
am: 43458f0249

Change-Id: I7e02ef17fb3b0defb7e3d048e680c8fb7872912c

7 years agoMerge "Add summary to special app access." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:37:06 +0000 (19:37 +0000)]
Merge "Add summary to special app access." into oc-dev

7 years agoUse standard preference layout for wallpaper picker
Fan Zhang [Mon, 17 Apr 2017 18:19:27 +0000 (11:19 -0700)]
Use standard preference layout for wallpaper picker

Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix: 37351626
Test: visual