Commit Graph

44637 Commits

Author SHA1 Message Date
Doris Ling
137dcb6998 Merge "Adjust alignment for suggestion icon." into pi-dev
am: 2d925f45b2

Change-Id: Id29c00047d3a3261f1ef567c56499e44e0973db6
2018-04-06 16:11:48 -07:00
Fan Zhang
0cd2ccfe30 Create help link placeholder for Wifi Direct settings.
Change-Id: Ia22259d191d2663d7ef63438c680826d3fd590fb
Merged-In: Ia22259d191d2663d7ef63438c680826d3fd590fb
Fixes: 70854725
Test: robotests
2018-04-06 23:06:36 +00:00
Doris Ling
2d925f45b2 Merge "Adjust alignment for suggestion icon." into pi-dev 2018-04-06 23:00:30 +00:00
Lei Yu
c5f5b18b22 Add NullPtrCheck when smearing in settings
This only happens in new device with broken power_profile.xml, in
which it doesn't have screen power model.

This CL catches the null pointer crash and log it.

Change-Id: Iac23e3a8fc51385bdb22979c4b59000319f6fd49
Fixes: 74617269
Test: RunSettingsRoboTests
2018-04-06 15:57:44 -07:00
Bill Yi
11c27313e6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: cd986c2c38  -s ours

Change-Id: Ib90910def317a57ec5f961b742ce380ad2cec06a
2018-04-06 15:54:50 -07:00
Matthew Fritze
bd4ba55cac Merge "Prioritize dynamic summaries" into pi-dev
am: c29aec4bde

Change-Id: Iaacc14c7da4f3957f940c44c70c57c2f77c97d00
2018-04-06 15:52:40 -07:00
TreeHugger Robot
cd986c2c38 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-06 22:42:17 +00:00
TreeHugger Robot
c29aec4bde Merge "Prioritize dynamic summaries" into pi-dev 2018-04-06 22:29:02 +00:00
Doris Ling
08908b2b20 Adjust alignment for suggestion icon.
- add margin to the suggestion icon so that it align properly with the
suggestion text.
- also align the action button with the suggestion icon and text.

Change-Id: Ic12e4160d6583cf2d837e65ee5fd5a1ad73d348d
Fixes: 74414989
Test: visual
2018-04-06 14:56:07 -07:00
Julia Reynolds
3fa5b4fad4 Merge "Make volume sliders sliceable" into pi-dev
am: 4ef7b5f97b

Change-Id: Ia92bfec5159228a3be82807f57ba28a9bc5f1e04
2018-04-06 14:43:27 -07:00
Lei Yu
21bde3afe4 Add test flags for battery tips.
When this flag is true, we will show related battery tip by force.
Then we can manually test and verify the UI behavior.

Following CL will add test flag for "app restriction" since it is
a little tricky.

Bug: 77477035
Test: RunSettingsRoboTests

Change-Id: Ib12ff4aa8bcc998ea6a73f461c3d5f7fcc39b019
2018-04-06 14:43:02 -07:00
Mehdi Alizadeh
3e2897b6cd Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev
am: 3ac16896b9

Change-Id: I7b3374df962e66e4a42fb393b091737d48754489
2018-04-06 14:37:59 -07:00
Lei Yu
84b0cbc3ee Merge "Add test for anomaly detection in P" into pi-dev
am: e0864a030f

Change-Id: Idff8e7772130d5d3de9485838f0b18b575517fac
2018-04-06 14:30:43 -07:00
Matthew Fritze
8db4358f76 Prioritize dynamic summaries
If both Xml and a controller provide a summary,
the controller's should be prioritized.

Change-Id: I030746b0f253ce4884a7868e385069b208f63082
Fixes: 77602860
Test: robotests
2018-04-06 14:11:50 -07:00
Erik Kline
fabbd1730c Fix test expectations for NetworkCallbacks
Test: as follows
    - built
    - flashed
    - booted
    - make -j50 RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Bug: 64133961
Bug: 77285360
Change-Id: I1ada2888d0c5517f3bcde646bf8efab331330cfd
2018-04-06 14:10:30 -07:00
Julia Reynolds
4ef7b5f97b Merge "Make volume sliders sliceable" into pi-dev 2018-04-06 20:48:31 +00:00
Mehdi Alizadeh
3ac16896b9 Merge "Adds strings for Swipe Up gesture in Settings" into pi-dev 2018-04-06 20:46:18 +00:00
TreeHugger Robot
e0864a030f Merge "Add test for anomaly detection in P" into pi-dev 2018-04-06 20:46:00 +00:00
Mehdi Alizadeh
00a2b83bf9 Adds strings for Swipe Up gesture in Settings
Bug: 77549883
Test: None
Change-Id: I64b448f3a3564e8ac6d29e1241e84032708dba71
2018-04-06 20:43:43 +00:00
Nicolas Geoffray
b3ef209fc6 Merge "Exempt tests from hidden API checks." into pi-dev
am: 8838b3fa9c

Change-Id: I216a952163773e944a298acd8bf3bd10ffc74067
2018-04-06 13:41:53 -07:00
arangelov
a739a63880 Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev
am: 22a12c0ea2

Change-Id: If954ac05b053ca51d622f3f11b1857e69d51375e
2018-04-06 13:41:21 -07:00
TreeHugger Robot
8838b3fa9c Merge "Exempt tests from hidden API checks." into pi-dev 2018-04-06 20:39:24 +00:00
Lei Yu
0c43bd4c36 Merge "Add battery illustration" into pi-dev
am: 3035d45a8f

Change-Id: If76a7efab6711d8290940d9cb3c2fb00fad63be4
2018-04-06 13:38:10 -07:00
TreeHugger Robot
22a12c0ea2 Merge "Change "More details" to "Learn more" in policy transparency dialog." into pi-dev 2018-04-06 20:35:41 +00:00
Lei Yu
17c2906404 Merge "Add name and icon for AOD" into pi-dev
am: f9cea645e1

Change-Id: Ib18392f893dff86ccbfd819529295aa740a22735
2018-04-06 13:35:31 -07:00
TreeHugger Robot
3035d45a8f Merge "Add battery illustration" into pi-dev 2018-04-06 20:26:24 +00:00
TreeHugger Robot
f9cea645e1 Merge "Add name and icon for AOD" into pi-dev 2018-04-06 20:19:21 +00:00
Lei Yu
7556fc543c Merge "Add anomaly log to dumpsys" into pi-dev
am: 4becdc6fbe

Change-Id: I17f464e967bd81ddd8995829a140009e02673d11
2018-04-06 12:37:26 -07:00
TreeHugger Robot
4becdc6fbe Merge "Add anomaly log to dumpsys" into pi-dev 2018-04-06 19:28:55 +00:00
Lei Yu
0e2c488273 Merge "Hide app if it shares uid with whitelisted app" into pi-dev
am: 78e2cad8b1

Change-Id: I14d9af57fc98b7f0398ce9c22abaaf5ad2d84976
2018-04-06 10:52:39 -07:00
Fan Zhang
24267b2e93 Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev
am: 14244ffb9d

Change-Id: Ie7bcdd045a651393ee3e60e3d7db6c48842788d8
2018-04-06 10:51:42 -07:00
Lei Yu
9553855af4 Add test for anomaly detection in P
Lot of tests have been added already, this CL adds the missing tests
after robolectric upgrade.

Also add UID_NULL check in AnomalyDetectionJobService. It is almost
impossible to happen however we better catch it.

Bug: 73172999
Test: RunSettingsRoboTests
Change-Id: I950537efb166b0900393df1321ca64151b43e906
2018-04-06 10:49:36 -07:00
Daniel Solomon
c04f722cab Merge "Disable user control of color mode depending on Accessibility" into pi-dev
am: c9bd31b2f8

Change-Id: I5e7124bcfc54705f40050ae0931c25a43b5c7b2b
2018-04-06 10:41:28 -07:00
Lei Yu
78e2cad8b1 Merge "Hide app if it shares uid with whitelisted app" into pi-dev 2018-04-06 17:19:19 +00:00
TreeHugger Robot
14244ffb9d Merge "Update SliceContollerInXmlTest to match latest slice spec." into pi-dev 2018-04-06 17:15:46 +00:00
TreeHugger Robot
c9bd31b2f8 Merge "Disable user control of color mode depending on Accessibility" into pi-dev 2018-04-06 17:12:01 +00:00
Patrick Baumann
7a2f9dcc34 Marking dictionary activity as visibleToInstantApps
Without this change, prompts to the user to add a word entered into
one of the text fields within an instant app would result in a crash.

Change-Id: I98c9dd21d4fbf6f65c519b7e34bcc11f43b6a92e
Fixes: 77273200
Test: manual - trigger add word launch from instant app
2018-04-06 10:08:26 -07:00
Tony Mak
4ccd4cb98c Merge "apostrophe should be curly" into pi-dev
am: 7a5e97e10f

Change-Id: I5410a068f2574b29e21de55e66c2607ee201c123
2018-04-06 09:44:43 -07:00
TreeHugger Robot
7a5e97e10f Merge "apostrophe should be curly" into pi-dev 2018-04-06 16:32:35 +00:00
Nicolas Geoffray
932679b141 Exempt tests from hidden API checks.
Bug: 64382372
Bug: 74963051

Test: m
Change-Id: I4e51a8a7d86ac79668f66057daf550a8f04711dd
2018-04-06 14:55:46 +01:00
arangelov
cf1e59a960 Change "More details" to "Learn more" in policy transparency dialog.
Screenshot: https://screenshot.googleplex.com/5xrwW3g29qa.png

Bug: 77618738
Test: none
Change-Id: I464f492cd6b1468b85b5a691c29ae7a982ecebff
2018-04-06 14:31:32 +01:00
Andreas Terzis
151f765339 Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev
am: c91339b3ce

Change-Id: Ic4b2dbbcd19a90cd28e0ca01c6f0cf248853b39f
2018-04-05 17:16:19 -07:00
ryanywlin
7eb22b055f Merge "Add new string for sound settings" into pi-dev
am: ac119ae807

Change-Id: Id42009e9eb40398a6ff31d4903d81827ff53057e
2018-04-05 17:14:35 -07:00
Bill Yi
52329a9cd3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I065e2a1271c2f8e4dba989736069982ed6be7f9d
2018-04-05 16:59:06 -07:00
TreeHugger Robot
c91339b3ce Merge ""Data Warn & Limits" pref. summary should be empty." into pi-dev 2018-04-05 23:41:47 +00:00
TreeHugger Robot
ac119ae807 Merge "Add new string for sound settings" into pi-dev 2018-04-05 23:33:40 +00:00
Bill Yi
32cab7934a [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3da184f074  -s ours

Change-Id: I4199238b803aa1841e096140e07c1faf4aacc274
2018-04-05 16:24:00 -07:00
TreeHugger Robot
3da184f074 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-04-05 23:12:21 +00:00
Jan Nordqvist
b2a8860b3c Merge "Change "X over" text color to ColorError" into pi-dev
am: 22bf690fdd

Change-Id: I97eef096124f7ad264e1d0d280e471db9d660d70
2018-04-05 16:11:16 -07:00
Lei Yu
85bab3d4d9 Add name and icon for AOD
Keep it in both app list and full usage list for now,
so we don't need to update smearing code.

Bug: 77156569
Test: Screenshot | RunSettingsRoboTests
Change-Id: I5247da90ea591b226cafef8f2d1ffcbff387b62f
2018-04-05 16:01:03 -07:00