Commit Graph

50242 Commits

Author SHA1 Message Date
Malcolm Chen
0a36e91a49 Don't show hidden subscriptions.
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.

Bug: 121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
2019-02-14 02:54:31 +00:00
Kevin Chyn
ee922128e4 Check for null before invoking finish()
Fixes: 124406109

Test: manual
Change-Id: Idee87c060ffd84395355ccdc5248166f1a6aeaf0
2019-02-13 18:23:08 -08:00
TreeHugger Robot
57b076fa76 Merge "Add logging for SettingsPanels" 2019-02-14 01:36:30 +00:00
timhypeng
23233700e5 Fix only one "active" HA showing under Accessibility Settings
-return main device on getConnectedHearingAidDevice()
-add test case

Bug: 123777253
Test: make -j42 RunSettingsRoboTests
Change-Id: I63522311b2248df983f200864b5465c0055056da
2019-02-14 01:31:03 +00:00
TreeHugger Robot
cf3c895835 Merge "Robotest fix." 2019-02-14 01:25:39 +00:00
Hall Liu
ba06ace05b Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3 am: 5232a30b03
am: 89b61e8e0a

Change-Id: Id7ff8fadb12185700859ceea48e3ddc6db4688bd
2019-02-13 17:17:51 -08:00
Hall Liu
89b61e8e0a Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3
am: 5232a30b03

Change-Id: Ia0a212d075868e020a784233dd6d5d640523a3d0
2019-02-13 16:33:22 -08:00
Hall Liu
5232a30b03 Merge "Add ACCESS_FINE_LOCATION to permissions"
am: a23ceba5c3

Change-Id: I873ee7b2898ab52b1a2a80d7da852d662bf10e6b
2019-02-13 16:14:10 -08:00
Matthew Fritze
b197110f71 Add logging for SettingsPanels
The 3 main categories are:
- Panel Opened
- Panel Closed
- Panel Slice interaction

There are 3 close events:
- See more button
- Done button
- Clicking outside the panel

Slice interactions will log the Uri of the Slice and the ActionType,
such as Toggle, Slider, Content (intent).

Change-Id: Iecad948f39f50dd12ae1bcb23a5d523e0df8bb98
Fixes: 117804231
Test: robotests
2019-02-13 16:06:24 -08:00
Alex Buynytskyy
0be46defa6 Robotest fix.
Repro: m dist RunSettingsRoboTests ROBOTEST_FILTER=widget

Test: Robolectric test
Change-Id: I4bd4be29ac28d7532bba8aa26d70758c58bd9a0e
2019-02-13 15:57:09 -08:00
TreeHugger Robot
0c4d976b82 Merge "Remove weird background color on stroage donut in dark mode" 2019-02-13 23:47:33 +00:00
TreeHugger Robot
d4fafc0c1f Merge "Make WakeScreen conditionally avaialable" 2019-02-13 23:42:22 +00:00
Hall Liu
a23ceba5c3 Merge "Add ACCESS_FINE_LOCATION to permissions" 2019-02-13 23:21:43 +00:00
TreeHugger Robot
7523f77296 Merge "User photo: Remove reference to Photo Gallery" 2019-02-13 22:53:04 +00:00
Lei Yu
bd06923f2f Merge "Update search for mobile network" 2019-02-13 22:43:22 +00:00
Fan Zhang
bcefbf288c Remove weird background color on stroage donut in dark mode
Bug: 124313940
Test: visual
Change-Id: Ie95c98c23bb67570418e49a1c6677d4b6809b5d2
2019-02-13 14:17:47 -08:00
TreeHugger Robot
ea7fa41c0d Merge "Change the default snoop log level to off." 2019-02-13 21:45:25 +00:00
Lucas Dupin
862aaed38c Make WakeScreen conditionally avaialable
Also moving the setting closer to 'Always On'

Fixes: 124389844
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceController
Change-Id: Ic19e01bf4259608dc0430507fbb3ce5ebf6fa456
2019-02-13 13:39:28 -08:00
TreeHugger Robot
7113ea2fde Merge "Update the font family for the conditional title" 2019-02-13 21:35:10 +00:00
TreeHugger Robot
2558451806 Merge "Make card bacground grey_900 instead of 800 in dark mode" 2019-02-13 21:11:15 +00:00
TreeHugger Robot
7b35e42f34 Merge "Set default background color for home icon." 2019-02-13 19:56:35 +00:00
Fan Zhang
dba9591fb7 Make card bacground grey_900 instead of 800 in dark mode
Change-Id: I7ccd59984949620340ebe66710b7956acde3e381
Fixes: 124313940
Test: visual
2019-02-13 11:16:00 -08:00
Fan Zhang
ca79899ebf Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf4740d
am: 798c93aafc

Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec
2019-02-13 10:43:46 -08:00
Alex Salo
469f1a345e Merge "Add more keywords to adaptive sleep setting" 2019-02-13 18:32:48 +00:00
Fan Zhang
798c93aafc Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82
am: 32fbf4740d

Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d
2019-02-13 10:29:46 -08:00
Fan Zhang
32fbf4740d Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
am: dabfd96c82

Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
2019-02-13 10:16:15 -08:00
Fan Zhang
dabfd96c82 Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" 2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834 Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
This reverts commit 910457e37a.
Fixes: 124370422


Reason for revert: b/124370422


Error: 

The following topic from AOSP:

https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)

Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:

FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
2019-02-13 17:59:40 +00:00
TreeHugger Robot
cd15971f14 Merge "Move horizontal progress bar into SettingsLib." 2019-02-13 13:53:56 +00:00
Mill Chen
c8e028cc83 Update the font family for the conditional title
Bug: 113451905
Test: visual
Change-Id: Ic58652f4ac3af0e72308a7c2c293b2ae73eb42b6
2019-02-13 16:57:00 +08:00
TreeHugger Robot
3eaa0ac051 Merge "Fix some problems with the "Mobile network" preference" 2019-02-13 05:44:06 +00:00
Mark Chien
0dae72387f [automerger skipped] Merge "Support entitlement check in DSDS" am: e3b4e0262c am: 0ac1c323b2
am: edc4fd30ea -s ours
am skip reason: change_id Ia4279a418dfa6cd14942b7f4d2a313156066381b with SHA1 1dd1d79d90 is in history

Change-Id: Ie6064467c68640776ec4abffdea90943880effc2
2019-02-12 20:58:48 -08:00
TreeHugger Robot
cfe5635df0 Merge "Show app usage data for the correct cycle." 2019-02-13 04:49:42 +00:00
Fan Zhang
b485a9195d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d am: dd3e2c4f27
am: 80fd417a58

Change-Id: I7b55262d7e3296a29e7efe4d33a4cab70e000175
2019-02-12 20:12:49 -08:00
Mark Chien
edc4fd30ea Merge "Support entitlement check in DSDS" am: e3b4e0262c
am: 0ac1c323b2

Change-Id: I9249eabb454648594ac5e303405f483266eee551
2019-02-12 20:06:32 -08:00
Fan Zhang
80fd417a58 Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
am: dd3e2c4f27

Change-Id: Ia2c1fa2eabcbe784e0d5525baf68d866f2366e6f
2019-02-12 19:33:56 -08:00
Mark Chien
0ac1c323b2 Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27 Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782
2019-02-12 18:41:40 -08:00
Kiyoung Kim
0dd278e85d [automerger skipped] Merge "Schematize ADB system properties" am: 750b90a22b am: 974ace22f9
am: de1971d7a0 -s ours
am skip reason: change_id Iec37f5f35b1452afdf7b15e9f31c4b4726127065 with SHA1 37bd3482ca is in history

Change-Id: Ic69304743c51cb1c07d20ce8d60f8d1c3f269a42
2019-02-12 18:35:41 -08:00
Mark Chien
e3b4e0262c Merge "Support entitlement check in DSDS" 2019-02-13 02:29:01 +00:00
Kiyoung Kim
de1971d7a0 Merge "Schematize ADB system properties" am: 750b90a22b
am: 974ace22f9

Change-Id: I04ab4b50e76d05341b4033c5e44cc6cb62964c39
2019-02-12 18:18:16 -08:00
TreeHugger Robot
d611df7c48 Merge "Misc ui tweaks." 2019-02-13 02:15:54 +00:00
Kiyoung Kim
974ace22f9 Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
2019-02-12 18:06:33 -08:00
jackqdyulei
5d3ead749a Update search for mobile network
Continue work from ag/5991582:
1. Add search support for CDMA/GSM related preference
2. Update func getAvailabilityStatus, inside it should get all
related manager from subId, rather than default one in controller.

Bug: 117843601
Bug: 77276236
Test: RunSettingsRoboTests

Change-Id: Id72505a512269bdc5adb02e806d38ac367ce9f07
2019-02-12 17:43:54 -08:00
Doris Ling
3d238da4b5 Show app usage data for the correct cycle.
- when launching the app data usage from the data usage list, pass the
info about the current cycle that the user is looking at, and select
the same cycle by default when the page is first launched to match the
data on the previous page.

Change-Id: Ic91bd8ee78db4d76551dff4b132c1b74d4b3c19d
Fixes: 123192721
Test: make RunSettingsRoboTests
2019-02-12 16:53:35 -08:00
Alex Salo
97e3967756 Add more keywords to adaptive sleep setting
Test: manually
Bug: 111939367
Change-Id: Ib1e61dc5e743f502233b7589ae2c14b586499630
2019-02-12 16:46:38 -08:00
TreeHugger Robot
545f8b1454 Merge "Update spec for CardPreference" 2019-02-13 00:39:24 +00:00
Fan Zhang
07207c0113 Misc ui tweaks.
- Update conditional card layout
  - move action button from right side to bottom.
  - Get rid of the forking between small/big screens.

- Update a few icons

Fixes: 121189136
Fixes: 124315564
Fixes: 124316920

Test: visual
Change-Id: I205d9995a2d7ed06ad9d32f3cea74f2840a28aed
2019-02-12 16:14:21 -08:00
Fan Zhang
3905ad125d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" 2019-02-13 00:12:08 +00:00
Torbjorn Eklund
73ffcf4999 Close Wi-Fi Calling screen if provisioning status changes to disallow
Starts to listen for provisioning changes in Wi-Fi Calling screen and
closes the screen if the Wi-Fi Calling provisioning status changes to
disallow.

This prevents the Wi-Fi Calling screen from being kept open if the Wi-Fi
Calling provisioning status is changed to disallow while the Wi-Fi
Calling screen is open.

Bug: 119389855
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Merged-In: I2af91c3734274f0aea942a8bb894d6f4ce295354
Change-Id: I2af91c3734274f0aea942a8bb894d6f4ce295354
2019-02-13 00:11:30 +00:00