Mill Chen
09fedbf7ec
Update the summary for DND conditional
...
Since original string is too long for DND conditional subtext, separate
DND conditional to two different states, one is for "Phone muted" state,
the othe is for "With exceptions" state.
Also, clean up the strings of other product variants for the conditional.
Bug: 122929205
Test: visual
Change-Id: Icb156ff9a4858a26355d92e6d4fb82ad1927b278
2019-02-15 18:37:25 +08:00
markchien
72ba39cdf4
Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627 am: 2ee5beaa32
...
am: c77ee11e4e
2019-02-13 22:43:11 -08:00
markchien
c77ee11e4e
Merge "Fix wrong TetherProvisioningActivity definition" am: f1e3e9d627
...
am: 2ee5beaa32
2019-02-13 22:39:00 -08:00
markchien
2ee5beaa32
Merge "Fix wrong TetherProvisioningActivity definition"
...
am: f1e3e9d627
2019-02-13 22:34:49 -08:00
Treehugger Robot
f1e3e9d627
Merge "Fix wrong TetherProvisioningActivity definition"
2019-02-14 06:19:30 +00:00
TreeHugger Robot
178d79dd66
Merge "Check for null before invoking finish()"
2019-02-14 04:58:05 +00:00
Pasty Chang
3c991847aa
Merge "Remove TemplateLayout that is not for external use"
2019-02-14 04:03:43 +00:00
markchien
8c713fc756
Fix wrong TetherProvisioningActivity definition
...
Bug: 122108346
Bug: 120069528
Test: build, boot, manual on/off hotspot
Change-Id: Iaeb2d271d901fcbd9d27c9a9de369e2af68d3645
2019-02-14 03:24:52 +00:00
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
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
2019-02-13 17:17:51 -08:00
Hall Liu
89b61e8e0a
Merge "Add ACCESS_FINE_LOCATION to permissions" am: a23ceba5c3
...
am: 5232a30b03
2019-02-13 16:33:22 -08:00
Hall Liu
5232a30b03
Merge "Add ACCESS_FINE_LOCATION to permissions"
...
am: a23ceba5c3
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
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
2019-02-13 10:29:46 -08:00
Fan Zhang
32fbf4740d
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
...
am: dabfd96c82
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 910457e37ahttps://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: edc4fd30ea1dd1d79d90
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
2019-02-12 20:12:49 -08:00
Mark Chien
edc4fd30ea
Merge "Support entitlement check in DSDS" am: e3b4e0262c
...
am: 0ac1c323b2
2019-02-12 20:06:32 -08:00
Fan Zhang
80fd417a58
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
...
am: dd3e2c4f27
2019-02-12 19:33:56 -08:00
Mark Chien
0ac1c323b2
Merge "Support entitlement check in DSDS"
...
am: e3b4e0262c
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
...
am: 3905ad125d
2019-02-12 18:41:40 -08:00
Kiyoung Kim
0dd278e85d
[automerger skipped] Merge "Schematize ADB system properties" am: 750b90a22b am: 974ace22f9
...
am: de1971d7a037bd3482ca
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
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
2019-02-12 18:06:33 -08:00
