OSDN Git Service

android-x86/packages-apps-Settings.git
5 years ago[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfeeea
Yiwei Zhang [Fri, 19 Apr 2019 00:54:49 +0000 (17:54 -0700)]
[automerger skipped] GUP: Fixed some typos and update some values am: d0bbbfeeea
am: e506f9d7f5 -s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1 5735199641 is in history

Change-Id: I0642e07bed6da847b16738f7e14f7aec2cb0632a

5 years ago[automerger skipped] GUP: Display a list of Apps and dialogs am: dc62028e85
Yiwei Zhang [Fri, 19 Apr 2019 00:54:12 +0000 (17:54 -0700)]
[automerger skipped] GUP: Display a list of Apps and dialogs am: dc62028e85
am: f0b7bf7cca -s ours
am skip reason: change_id Ide4934c0dd3901532723e77e74663e5a7b639026 with SHA1 83c030f1cd is in history

Change-Id: I34b7e2c2ef9afba6baee101ddc29ba7b9e022be0

5 years ago[automerger skipped] GUP: Add stub UI am: a2754c515b
Yiwei Zhang [Fri, 19 Apr 2019 00:53:34 +0000 (17:53 -0700)]
[automerger skipped] GUP: Add stub UI am: a2754c515b
am: 329a5e938e -s ours
am skip reason: change_id I1f7cc66790e1d1e1de5113e28a055ec5d1679013 with SHA1 c81a03b60e is in history

Change-Id: I8be0f7ee8f61a455d1503554101e18b7b15c7ce8

5 years agoGUP: Fixed some typos and update some values
Yiwei Zhang [Fri, 19 Apr 2019 00:33:07 +0000 (17:33 -0700)]
GUP: Fixed some typos and update some values
am: d0bbbfeeea

Change-Id: I0d23b978d62c2c0eaced50c878e874844d7862db

5 years agoGUP: Display a list of Apps and dialogs
Yiwei Zhang [Fri, 19 Apr 2019 00:30:54 +0000 (17:30 -0700)]
GUP: Display a list of Apps and dialogs
am: dc62028e85

Change-Id: I3d13512fda47d401444f665636d83dff2fb23882

5 years agoGUP: Add stub UI
Yiwei Zhang [Fri, 19 Apr 2019 00:28:33 +0000 (17:28 -0700)]
GUP: Add stub UI
am: a2754c515b

Change-Id: Ia9d6d44d106b7dc3b54218921039e9ee03967533

5 years agoMerge "Non-blockable whitelist should only control importance fields" into qt-dev
Julia Reynolds [Thu, 18 Apr 2019 22:20:17 +0000 (15:20 -0700)]
Merge "Non-blockable whitelist should only control importance fields" into qt-dev
am: 8bfc277f7d

Change-Id: If5499e8bdb1c60f7e70c5393ee6428cbb08f608d

5 years agoMerge "Revert "Add robotest modules for Settings"" into qt-dev
Mill Chen [Thu, 18 Apr 2019 22:18:51 +0000 (15:18 -0700)]
Merge "Revert "Add robotest modules for Settings"" into qt-dev
am: d0dd6d8885

Change-Id: I92acba8f32bc1bbb8ae8dff21637c9b0f0db02bd

5 years agoMerge "Redesign channel listing and channel page" into qt-dev
Julia Reynolds [Thu, 18 Apr 2019 22:05:37 +0000 (15:05 -0700)]
Merge "Redesign channel listing and channel page" into qt-dev
am: 9496bce441

Change-Id: I7616f9164b8178f31423e0c048700391a667f192

5 years agoMerge "Non-blockable whitelist should only control importance fields" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 21:56:02 +0000 (21:56 +0000)]
Merge "Non-blockable whitelist should only control importance fields" into qt-dev

5 years agoMerge "Revert "Add robotest modules for Settings"" into qt-dev
Mill Chen [Thu, 18 Apr 2019 21:49:51 +0000 (21:49 +0000)]
Merge "Revert "Add robotest modules for Settings"" into qt-dev

5 years agoRevert "Add robotest modules for Settings"
Mill Chen [Thu, 18 Apr 2019 21:45:21 +0000 (21:45 +0000)]
Revert "Add robotest modules for Settings"

This reverts commit ce09f5836046a8c987b2ef1cf24be65ccc550d3f.

Reason for revert: will build break on run_host_tests

Bug: 130774632

Change-Id: Id2ee52ffb0689059da9cbdadd5bdae5b6a04a589

5 years agoMerge "Redesign channel listing and channel page" into qt-dev
Julia Reynolds [Thu, 18 Apr 2019 21:34:36 +0000 (21:34 +0000)]
Merge "Redesign channel listing and channel page" into qt-dev

5 years agoMerge "Add correct animation" into qt-dev
Alex Salo [Thu, 18 Apr 2019 20:39:57 +0000 (13:39 -0700)]
Merge "Add correct animation" into qt-dev
am: 7ad8c7bc2f

Change-Id: I5560dce9ebcce1c853fdcea32922c7645bd789ea

5 years agoGUP: Fixed some typos and update some values
Yiwei Zhang [Thu, 10 Jan 2019 20:40:04 +0000 (04:40 +0800)]
GUP: Fixed some typos and update some values

Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0
Merged-In: I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0

5 years agoGUP: Display a list of Apps and dialogs
Yiwei Zhang [Sat, 29 Dec 2018 00:52:31 +0000 (08:52 +0800)]
GUP: Display a list of Apps and dialogs

1) Add preference controller for gup dashboard and add list preferences
for each entry of the apps
2) Add gup dashboard page to search index
3) Add comprehensive tests for GupPreferenceController

Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ide4934c0dd3901532723e77e74663e5a7b639026
Merged-In: Ide4934c0dd3901532723e77e74663e5a7b639026

5 years agoMerge "Add correct animation" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 20:26:17 +0000 (20:26 +0000)]
Merge "Add correct animation" into qt-dev

5 years agoMerge "Fix regression of wrong min value on night display slice" into qt-dev
lindatseng [Thu, 18 Apr 2019 20:24:12 +0000 (13:24 -0700)]
Merge "Fix regression of wrong min value on night display slice" into qt-dev
am: 93aee0d99d

Change-Id: I153d69e5cc07ab5a2aec7972150a80f706ccdb87

5 years agoMerge "Make fingerprint illustrations single color" into qt-dev
Maurice Lam [Thu, 18 Apr 2019 20:16:52 +0000 (13:16 -0700)]
Merge "Make fingerprint illustrations single color" into qt-dev
am: f63bdb8b6b

Change-Id: I3c03d6fbfb71e815840729425c0f1946fdc9cb76

5 years agoMerge "Fix regression of wrong min value on night display slice" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 19:44:43 +0000 (19:44 +0000)]
Merge "Fix regression of wrong min value on night display slice" into qt-dev

5 years agoMerge "Make fingerprint illustrations single color" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 19:38:34 +0000 (19:38 +0000)]
Merge "Make fingerprint illustrations single color" into qt-dev

5 years agoMerge "Add Settings keywords for Styles & Wallpaper." into qt-dev
Amin Shaikh [Thu, 18 Apr 2019 19:32:55 +0000 (12:32 -0700)]
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev
am: 670bf45b50

Change-Id: I4a5e50cf64660601bc8864be4c8fcf04f5ae1c83

5 years agoMerge "Finalize the adaptive sleep icon" into qt-dev
Alex Salo [Thu, 18 Apr 2019 19:23:50 +0000 (12:23 -0700)]
Merge "Finalize the adaptive sleep icon" into qt-dev
am: 8ca49b5764

Change-Id: Ic741170c9ddb56e1fdf21a89d7b3fb627be7b8ef

5 years agoNon-blockable whitelist should only control importance fields
Julia Reynolds [Thu, 18 Apr 2019 18:45:14 +0000 (14:45 -0400)]
Non-blockable whitelist should only control importance fields

Sounds, etc. should still be modifiable

Test: robotests
Fixes: 130086523
Change-Id: I1a95a73b299bb3afd169b249a3dabae3583a448a

5 years agoRedesign channel listing and channel page
Julia Reynolds [Fri, 12 Apr 2019 20:52:40 +0000 (16:52 -0400)]
Redesign channel listing and channel page

Test: atest
Bug: 127796543
Fixes: 129452112
Fixes: 129453207
Change-Id: I1d520c9e35860303235b7ffbb18a76cbc4f4b8bc

5 years agoMerge "Add Settings keywords for Styles & Wallpaper." into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 18:43:35 +0000 (18:43 +0000)]
Merge "Add Settings keywords for Styles & Wallpaper." into qt-dev

5 years agoMerge "Finalize the adaptive sleep icon" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 18:42:46 +0000 (18:42 +0000)]
Merge "Finalize the adaptive sleep icon" into qt-dev

5 years agoMerge "Move "Build Number" slice to a different controller." into qt-dev
Fan Zhang [Thu, 18 Apr 2019 18:34:10 +0000 (11:34 -0700)]
Merge "Move "Build Number" slice to a different controller." into qt-dev
am: 95073738ea

Change-Id: Ia40218af84ded88e80e422c6f7551f5b9315febb

5 years agoMerge "Move "Build Number" slice to a different controller." into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 18:16:19 +0000 (18:16 +0000)]
Merge "Move "Build Number" slice to a different controller." into qt-dev

5 years agoFix regression of wrong min value on night display slice
lindatseng [Thu, 18 Apr 2019 07:51:23 +0000 (00:51 -0700)]
Fix regression of wrong min value on night display slice

The min value of NightDisplayIntensityPreferenceController
should always be 0 (which is the old value we used before
ag/7062353). The range is cacluated from the relative value
to MinimumColorTemperature, which means the min value should
always be 0.

Test: atest NightDisplayIntensityPreferenceControllerTest
Fixes:130758028
Change-Id: Ica75672dda6a9ee0c6013f1c903611263b7d133f

5 years agoMerge "Prevent bad apps from getting Setting Slices" into qt-dev
Matthew Fritze [Thu, 18 Apr 2019 17:53:51 +0000 (10:53 -0700)]
Merge "Prevent bad apps from getting Setting Slices" into qt-dev
am: 7f9a86d869

Change-Id: I915a1ed62d0f92cfb3be0c9cea4aeac416328936

5 years agoMerge "Prevent bad apps from getting Setting Slices" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 17:38:28 +0000 (17:38 +0000)]
Merge "Prevent bad apps from getting Setting Slices" into qt-dev

5 years agoAdd Settings keywords for Styles & Wallpaper.
Amin Shaikh [Thu, 18 Apr 2019 15:13:01 +0000 (11:13 -0400)]
Add Settings keywords for Styles & Wallpaper.

Reusing existing strings since this is coming in after string freeze.
TODO: create a new keyword string for this preference.

Fixes: 130759285
Test: m RunSettingsRoboTests and searching keywords on device
Change-Id: Ice1bc34b381302745cb55056377cc94ea74e8d50

5 years agoMerge "Let NGA item display above advanced item in the App & Notifications" into...
Sunny Shao [Thu, 18 Apr 2019 17:07:36 +0000 (10:07 -0700)]
Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev
am: 57da877dde

Change-Id: I53ff246a5614c1dc57717b94c84261cdbcaf8f5a

5 years agoMerge "Remove the duplicated search item" into qt-dev
Sunny Shao [Thu, 18 Apr 2019 17:06:41 +0000 (10:06 -0700)]
Merge "Remove the duplicated search item" into qt-dev
am: 1282390768

Change-Id: Ic855545cab08d8a27fd82ea753b5481cfb3f5dce

5 years agoMerge "[Network Connection] Show full SSID on list item" into qt-dev
cosmohsieh [Thu, 18 Apr 2019 17:05:44 +0000 (10:05 -0700)]
Merge "[Network Connection] Show full SSID on list item" into qt-dev
am: 6e115e4fda

Change-Id: I7a5250221d73d163961f9894f96701d699711c90

5 years agoSet description textview to fixed id
pastychang [Thu, 18 Apr 2019 17:03:42 +0000 (10:03 -0700)]
Set description textview to fixed id
am: f8409db196

Change-Id: I5f67c31f13e6d2b9bc029905e90f02caf6043a4f

5 years agoMerge "Let NGA item display above advanced item in the App & Notifications" into...
TreeHugger Robot [Thu, 18 Apr 2019 16:54:58 +0000 (16:54 +0000)]
Merge "Let NGA item display above advanced item in the App & Notifications" into qt-dev

5 years agoMerge "Remove the duplicated search item" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 16:51:56 +0000 (16:51 +0000)]
Merge "Remove the duplicated search item" into qt-dev

5 years agoMerge "[Network Connection] Show full SSID on list item" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 16:51:37 +0000 (16:51 +0000)]
Merge "[Network Connection] Show full SSID on list item" into qt-dev

5 years agoMove "Build Number" slice to a different controller.
Fan Zhang [Wed, 17 Apr 2019 23:25:34 +0000 (16:25 -0700)]
Move "Build Number" slice to a different controller.

There are 2 build number tiles in settings: Android version -> Build
number and About phone -> build number.

The way we index breadcrumb for each slice is making some client
confused. So this change moves the slice capability from Androi
version>BuildNumber to About phone.

Fixes: 130652710
Test: reindex, robotest
Change-Id: I9054d0db124b706e7984cd3d19774bb604bd7fd3

5 years agoPrevent bad apps from getting Setting Slices
Matthew Fritze [Thu, 18 Apr 2019 15:51:17 +0000 (08:51 -0700)]
Prevent bad apps from getting Setting Slices

SettingsSliceProvider no longer allows apps to request permission
from the user for Settings Slices. Instead, the PrimaryAction on the
permission slice will be an intent into Settings.

This is because the dialog for granting apps Settings Slices would act
as a replacement for regular permission dialogs, which we want to avoid.

Fixes: 130795282
Test: robolectrico
Change-Id: I6848215bab2bf10ee5e53814b765d04f04f53f4e

5 years agoRemove the duplicated search item
Sunny Shao [Thu, 18 Apr 2019 09:17:39 +0000 (17:17 +0800)]
Remove the duplicated search item

Disable the searchable of the "Adaptive battery" item in the smart_battery_detail.xml

Fixes: 130656532
Test: Manual View
Change-Id: I95beb97fc09ff6858f7b4e0e576a598c3520db86

5 years agoSet description textview to fixed id
pastychang [Thu, 18 Apr 2019 07:34:06 +0000 (15:34 +0800)]
Set description textview to fixed id

Modify to fixed id for landscape Glif layout and non-glif layout

Test: Manual
Bug: 130707943
Change-Id: I6346817e582c2aac26753b3a985038cb0ca421bc

5 years agoLet NGA item display above advanced item in the App & Notifications
Sunny Shao [Thu, 18 Apr 2019 07:24:48 +0000 (15:24 +0800)]
Let NGA item display above advanced item in the App & Notifications

Change the value of the initialExpandedChildrenCount to 4 and let NGA item to show.

Fixes: 130420794
Test: Manual View
Change-Id: Ic2453944a5eaea0b5fd65e0272bfac64ffbc1eec

5 years agoMerge "Tweak enrollment intro layout" into qt-dev
Kevin Chyn [Thu, 18 Apr 2019 04:42:34 +0000 (21:42 -0700)]
Merge "Tweak enrollment intro layout" into qt-dev
am: 3683a688f7

Change-Id: Id76defc6138c9fdddeb3c90343e7b4bb12bf556a

5 years agoMerge "Tweak enrollment intro layout" into qt-dev
Kevin Chyn [Thu, 18 Apr 2019 04:09:12 +0000 (04:09 +0000)]
Merge "Tweak enrollment intro layout" into qt-dev

5 years agoMerge "[PasspointV2] Set summary of saved networks preference" into qt-dev
cosmohsieh [Thu, 18 Apr 2019 01:27:22 +0000 (18:27 -0700)]
Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev
am: bb00e4c028

Change-Id: I537acf599d704a1aa1a5ae21e5cbd4aba15728e4

5 years agoMerge "Updated strings for dynamic privacy" into qt-dev
Selim Cinek [Thu, 18 Apr 2019 01:03:42 +0000 (18:03 -0700)]
Merge "Updated strings for dynamic privacy" into qt-dev
am: 9f374307c5

Change-Id: I2de918bb6e5ea7e7c116014d9c4c07e6670d950b

5 years agoMerge "Implement context menu for ConnectedAccessPointPreference" into qt-dev
cosmohsieh [Thu, 18 Apr 2019 01:02:34 +0000 (18:02 -0700)]
Merge "Implement context menu for ConnectedAccessPointPreference" into qt-dev
am: f590d5c617

Change-Id: Id59d97f64f5a36e5ecfb7cc95836b65c04334082

5 years agoMerge "[PasspointV2] Set summary of saved networks preference" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 00:58:22 +0000 (00:58 +0000)]
Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev

5 years agoMerge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev
Fan Zhang [Thu, 18 Apr 2019 00:54:37 +0000 (17:54 -0700)]
Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev
am: f6f4ae6e1c

Change-Id: I3961ec0da3fb934d581e26c34ef4136d26b28417

5 years agoMerge "Updated strings for dynamic privacy" into qt-dev
Selim Cinek [Thu, 18 Apr 2019 00:42:55 +0000 (00:42 +0000)]
Merge "Updated strings for dynamic privacy" into qt-dev

5 years agoMerge "Implement context menu for ConnectedAccessPointPreference" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 00:33:41 +0000 (00:33 +0000)]
Merge "Implement context menu for ConnectedAccessPointPreference" into qt-dev

5 years agoMerge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev
TreeHugger Robot [Thu, 18 Apr 2019 00:29:33 +0000 (00:29 +0000)]
Merge "Remove on/off subtext from gesture preferencecontrollers" into qt-dev

5 years agoMerge "Add robotest modules for Settings" into qt-dev
Mill Chen [Thu, 18 Apr 2019 00:25:08 +0000 (17:25 -0700)]
Merge "Add robotest modules for Settings" into qt-dev
am: 0e38f902c5

Change-Id: Iaea9e89f0d9b64c5e88234308d379d09cb170ff2

5 years agoFinalize the adaptive sleep icon
Alex Salo [Thu, 18 Apr 2019 00:11:30 +0000 (17:11 -0700)]
Finalize the adaptive sleep icon

Bug: 129352433
Test: manually

Change-Id: I00cf2e5e7e8a9ebd60d9aa4e9047c9cd04ec16c7

5 years agoRemove on/off subtext from gesture preferencecontrollers
Fan Zhang [Wed, 17 Apr 2019 20:29:25 +0000 (13:29 -0700)]
Remove on/off subtext from gesture preferencecontrollers

The toggle switch next to the subtitle already shows on/off clearly.

Fixes: 130652619
Fixes: 130652843
Fixes: 130653459
Fixes: 130653297
Test: robo
Change-Id: Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5

5 years agoMerge "Add robotest modules for Settings" into qt-dev
Mill Chen [Wed, 17 Apr 2019 23:42:52 +0000 (23:42 +0000)]
Merge "Add robotest modules for Settings" into qt-dev

5 years agoAdd robotest modules for Settings
Mill Chen [Wed, 17 Apr 2019 19:36:27 +0000 (12:36 -0700)]
Add robotest modules for Settings

Use ROBOTEST_FILTER to divide RunSettingsRoboTests into several smaller
parts.

Bug: 130511490
Test: make -j RunSettingsRoboTests-applications && make -j
RunSettingsRoboTests-wifi

Change-Id: I16ea575877df7a495de9344971421d221e197b89

5 years ago[automerger skipped] Merge "Update SettingsRoboTests for truth 0.42" am: 1e342c5be6
Colin Cross [Wed, 17 Apr 2019 23:35:07 +0000 (16:35 -0700)]
[automerger skipped] Merge "Update SettingsRoboTests for truth 0.42" am: 1e342c5be6
am: 2df12ab3bb -s ours
am skip reason: change_id I32cb2fcf6094675f79d2fc24702ef6298a9691e4 with SHA1 cdf284b732 is in history

Change-Id: I4a0e8480124ad9d96ba3be26faf41cfe80b1c047

5 years agoMerge "Update SettingsRoboTests for truth 0.42"
Colin Cross [Wed, 17 Apr 2019 23:23:06 +0000 (16:23 -0700)]
Merge "Update SettingsRoboTests for truth 0.42"
am: 1e342c5be6

Change-Id: I76e84b28fc62f50e16fe712eb2da234912473652

5 years agoMerge "Update SettingsRoboTests for truth 0.42"
Colin Cross [Wed, 17 Apr 2019 23:16:08 +0000 (23:16 +0000)]
Merge "Update SettingsRoboTests for truth 0.42"

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Wed, 17 Apr 2019 22:43:10 +0000 (15:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: ff7f14a966 -s ours
am skip reason: subject contains skip directive

Change-Id: I02f2b404d013d290b02e8df1a41b543e2742ba89

5 years agoMerge "Only get apps with permission granted." into qt-dev
Joel Galenson [Wed, 17 Apr 2019 22:36:15 +0000 (15:36 -0700)]
Merge "Only get apps with permission granted." into qt-dev
am: ae50ffbf04

Change-Id: Idd1e27d02dee580c8dc53c5335803face7f3f419

5 years agoMerge "Updated ConfirmDeviceCredential strings" into qt-dev
joshmccloskey [Wed, 17 Apr 2019 22:25:57 +0000 (15:25 -0700)]
Merge "Updated ConfirmDeviceCredential strings" into qt-dev
am: f90c24d194

Change-Id: I37c1da95d23cb91127ccaf7e9f3b792737457124

5 years ago[automerger skipped] Merge changes from topic "GameDriver" am: 1d518f422b
Peiyong Lin [Wed, 17 Apr 2019 21:41:48 +0000 (14:41 -0700)]
[automerger skipped] Merge changes from topic "GameDriver" am: 1d518f422b
am: 292904293a -s ours
am skip reason: change_id Ibc0814b6cd1e9bee991624c925456bc330fd93c6 with SHA1 e70d103266 is in history

Change-Id: Id6bbc8eb9bb6d3399c312d97fc6d3ea5fd667025

5 years agoUpdate SettingsRoboTests for truth 0.42
Colin Cross [Sat, 13 Apr 2019 05:31:59 +0000 (22:31 -0700)]
Update SettingsRoboTests for truth 0.42

SubjectFactory has been replaced with Subject.Factory.

Subject.getDisplaySubject has been replaced with
actualCustomStringRepresentation.

Bug: 130435731
Test: m checkbuild
Change-Id: I2799badfb79432ec70cb928b77294d6940cfc019
Merged-In: I32cb2fcf6094675f79d2fc24702ef6298a9691e4

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 21:34:14 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years ago[automerger skipped] Add developer option to opt-in updatable graphics driver. am...
Peiyong Lin [Wed, 17 Apr 2019 21:20:04 +0000 (14:20 -0700)]
[automerger skipped] Add developer option to opt-in updatable graphics driver. am: 5a92a74f23
am: add03324df -s ours
am skip reason: change_id I8c3905fd5c1cbfb3ce12e589b48f57396c7776e3 with SHA1 4a48086728 is in history

Change-Id: I6301f613fd796a1d08ed7f00dc350b3a60fab8fe

5 years agoMerge "Only get apps with permission granted." into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 21:19:52 +0000 (21:19 +0000)]
Merge "Only get apps with permission granted." into qt-dev

5 years agoMerge "Updated ConfirmDeviceCredential strings" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 21:13:41 +0000 (21:13 +0000)]
Merge "Updated ConfirmDeviceCredential strings" into qt-dev

5 years agoMerge changes from topic "GameDriver"
Peiyong Lin [Wed, 17 Apr 2019 21:05:24 +0000 (14:05 -0700)]
Merge changes from topic "GameDriver"
am: 1d518f422b

Change-Id: I6e87de41a3ccb3e06dbbca44c797a4a16e123087

5 years agoAdd developer option to opt-in updatable graphics driver.
Peiyong Lin [Wed, 17 Apr 2019 21:04:05 +0000 (14:04 -0700)]
Add developer option to opt-in updatable graphics driver.
am: 5a92a74f23

Change-Id: Ib73af7ac9e9e4e33d8a5eca24a5b76f60af77132

5 years agoTweak enrollment intro layout
Kevin Chyn [Wed, 17 Apr 2019 20:44:03 +0000 (13:44 -0700)]
Tweak enrollment intro layout

Bug: 130740447

Test: Builds
Change-Id: If3b4ad795588586dcd6fb848bee213df0ae1095e

5 years agoAdd correct animation
Alex Salo [Wed, 17 Apr 2019 19:25:36 +0000 (12:25 -0700)]
Add correct animation

Bug: 129352433
Test: manually
Change-Id: I381059203c477407297765936e48271519852f56

5 years agoMerge changes from topic "GameDriver"
Treehugger Robot [Wed, 17 Apr 2019 19:28:15 +0000 (19:28 +0000)]
Merge changes from topic "GameDriver"

* changes:
  Rename updatable graphics driver to Game Update Package.
  Add developer option to opt-in updatable graphics driver.

5 years agoMerge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev
Quang Luong [Wed, 17 Apr 2019 19:20:44 +0000 (12:20 -0700)]
Merge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev
am: 7af19fcb86

Change-Id: I2096086e4463279d426896c774f3c4e00945a216

5 years agoUpdated strings for dynamic privacy
Selim Cinek [Thu, 11 Apr 2019 23:06:44 +0000 (16:06 -0700)]
Updated strings for dynamic privacy

In the new world redacted content is also
revealed with smart lock.

Bug: 130227087
Test: observe strings
Change-Id: I69ad8fab65dde5be405d47c4426bee52b0911383

5 years agoOnly get apps with permission granted.
Joel Galenson [Wed, 17 Apr 2019 18:10:48 +0000 (11:10 -0700)]
Only get apps with permission granted.

The subtitle gives the number of apps that can access location, but it
currently collects all apps that request location, including those
that are denied.  Ensure that we only count granted apps.

Bug: 129296799
Test: Open Settings, see the count is much lower.
Change-Id: I9a18bbb62be742731205dab9f5b8e9a703ea030c

5 years agoMerge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev
Quang Luong [Wed, 17 Apr 2019 17:57:39 +0000 (17:57 +0000)]
Merge "Fixed Passpoint network "Not in range" issue and forget button" into qt-dev

5 years agoMerge "Update strings for the title of lock screen skip dialog" into qt-dev
Maurice Lam [Wed, 17 Apr 2019 17:46:35 +0000 (10:46 -0700)]
Merge "Update strings for the title of lock screen skip dialog" into qt-dev
am: 47bea2d483

Change-Id: Ib994b45088365d8304af4d78ee53c0dce4c643b1

5 years agoMerge "Turn off debug logging flags" into qt-dev
Yanting Yang [Wed, 17 Apr 2019 17:45:33 +0000 (10:45 -0700)]
Merge "Turn off debug logging flags" into qt-dev
am: ed9be192b6

Change-Id: Ib0b539172fdeff2eabb86033b10af1b811171e7f

5 years agoMerge "Update summary lines of half condition card" into qt-dev
Yanting Yang [Wed, 17 Apr 2019 17:36:52 +0000 (10:36 -0700)]
Merge "Update summary lines of half condition card" into qt-dev
am: 06ada5b1b1

Change-Id: I999f104cef24b2801e07c9379fdc1dd0e9e3fd63

5 years agoMerge "Update strings for the title of lock screen skip dialog" into qt-dev
Maurice Lam [Wed, 17 Apr 2019 17:29:49 +0000 (17:29 +0000)]
Merge "Update strings for the title of lock screen skip dialog" into qt-dev

5 years agoMerge "Default to enable oem-unlocking preference" into qt-dev
Mill Chen [Wed, 17 Apr 2019 17:24:05 +0000 (10:24 -0700)]
Merge "Default to enable oem-unlocking preference" into qt-dev
am: c82a225c6f

Change-Id: Iabcddecee0b0b7d36e3868c617c46ec85867b7d4

5 years agoMerge "Turn off debug logging flags" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 17:12:39 +0000 (17:12 +0000)]
Merge "Turn off debug logging flags" into qt-dev

5 years agoMerge "Update summary lines of half condition card" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 17:09:29 +0000 (17:09 +0000)]
Merge "Update summary lines of half condition card" into qt-dev

5 years agoMerge "Default to enable oem-unlocking preference" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 16:54:19 +0000 (16:54 +0000)]
Merge "Default to enable oem-unlocking preference" into qt-dev

5 years agoMerge "Do not special case the storage permission group." into qt-dev
Joel Galenson [Wed, 17 Apr 2019 14:45:09 +0000 (07:45 -0700)]
Merge "Do not special case the storage permission group." into qt-dev
am: 634b56cb17

Change-Id: I628009b969d2089151f723c233594cb919fd146d

5 years agoMerge "Do not special case the storage permission group." into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 14:21:49 +0000 (14:21 +0000)]
Merge "Do not special case the storage permission group." into qt-dev

5 years agoTurn off debug logging flags
Yanting Yang [Wed, 17 Apr 2019 09:34:34 +0000 (17:34 +0800)]
Turn off debug logging flags

Fixes: 130558346
Test: visual
Change-Id: Ie82bfe503f789435a3474697391fdfdeb94864ee

5 years agoUpdate summary lines of half condition card
Yanting Yang [Tue, 16 Apr 2019 09:44:09 +0000 (17:44 +0800)]
Update summary lines of half condition card

To optimize the visual design for regular font size in summary field.

Fixes: 130588679
Test: visual

Change-Id: I89142f403646139b150f38b70b52b0d7b36fed9e

5 years ago[PasspointV2] Set summary of saved networks preference
cosmohsieh [Sun, 14 Apr 2019 07:38:30 +0000 (15:38 +0800)]
[PasspointV2] Set summary of saved networks preference

Summary text of "saved networks" preference has number of both normal
networks and subscriptions

Bug: 130259573
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I8bdf41c1a85165298a2ccd9e688c30b0bd593bfa

5 years agoMerge "Add subtitle for Do not disturb" into qt-dev
Mill Chen [Wed, 17 Apr 2019 09:16:51 +0000 (02:16 -0700)]
Merge "Add subtitle for Do not disturb" into qt-dev
am: cf9b3d2e87

Change-Id: I60ec7bc78b4cf6a429c6e0ccdb3b092431e0a72b

5 years agoMerge "Remove On/Off string from Night light slice" into qt-dev
Mill Chen [Wed, 17 Apr 2019 09:15:47 +0000 (02:15 -0700)]
Merge "Remove On/Off string from Night light slice" into qt-dev
am: 0ce66b9329

Change-Id: Ie39cc0e3bafe863ae1a200fbde13bca7b9da8961

5 years agoMerge "Add subtitle for Do not disturb" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)]
Merge "Add subtitle for Do not disturb" into qt-dev

5 years agoMerge "Remove On/Off string from Night light slice" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 09:03:07 +0000 (09:03 +0000)]
Merge "Remove On/Off string from Night light slice" into qt-dev

5 years agoMerge "Fix wrong color for rippleColor" into qt-dev
Mill Chen [Wed, 17 Apr 2019 08:51:43 +0000 (01:51 -0700)]
Merge "Fix wrong color for rippleColor" into qt-dev
am: 7cc1469bb6

Change-Id: I62a21a22ddd5a3778607a012213bdc923e1fee72

5 years agoMerge "Fix wrong color for rippleColor" into qt-dev
TreeHugger Robot [Wed, 17 Apr 2019 08:46:46 +0000 (08:46 +0000)]
Merge "Fix wrong color for rippleColor" into qt-dev