Commit Graph

59400 Commits

Author SHA1 Message Date
Automerger Merge Worker
51816dea20 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91
Change-Id: I44d40b631ac49e89a5f7a02626d10022364cef14
2020-02-24 17:46:52 +00:00
Automerger Merge Worker
f6ae9a4864 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91
Change-Id: I6a366015c4458c04ff67cfe9d610ef272f751454
2020-02-24 17:46:43 +00:00
Automerger Merge Worker
e987aeecde Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c
Change-Id: I503efe54953615b70760d817cff50a438316e424
2020-02-24 17:31:43 +00:00
Automerger Merge Worker
5228fbbb91 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c
Change-Id: Ie76c3c24f331a3dc741075ab8f8a1a64dc38a163
2020-02-24 17:31:33 +00:00
TreeHugger Robot
cdc7fffd2c Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev 2020-02-24 17:22:49 +00:00
Automerger Merge Worker
9d584ced7f Merge "[automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: b916ae9135 -s ours am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history" into rvc-qpr-dev-plus-aosp 2020-02-24 15:48:30 +00:00
Automerger Merge Worker
f657fe78aa [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: cff703ccb9 -s ours am: fe6a2d20fa -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: I385d6921bbbea3dddf0ff4952bc59e4984ce11ab
2020-02-24 15:48:28 +00:00
Automerger Merge Worker
77f2cb26c1 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: b916ae9135 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Ia5d89c00d870011d5eb609cf99815d95d6153399
2020-02-24 15:48:23 +00:00
Automerger Merge Worker
656b6e491c [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: 30a21c11a3 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I515a7dab7f2b7ed6f4c3223dc0f08c03bcbe005c
2020-02-24 15:48:21 +00:00
Automerger Merge Worker
b916ae9135 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I63a148bd765d6d3d56249ac11f6f7cc04238b609
2020-02-24 15:30:52 +00:00
Automerger Merge Worker
fe6a2d20fa [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: cff703ccb9 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: I395fbdeb7daffbee72f4b744439e279b66a1e967
2020-02-24 15:30:51 +00:00
Automerger Merge Worker
30a21c11a3 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I3524d32759c97cce78da380f4de3c0a768705be0
2020-02-24 15:30:42 +00:00
Automerger Merge Worker
cff703ccb9 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I015da63fc64ac8bbd35b64c7f30eed2ee84d93b8
2020-02-24 15:18:24 +00:00
Automerger Merge Worker
35294a1532 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Id69bc466f138dc5db47a853b01ed09507048e5b7
2020-02-24 15:18:08 +00:00
Automerger Merge Worker
f9779a0435 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Id3bf8f851a257a95cbdb747dc7f7f93b71ae7d26
2020-02-24 15:06:03 +00:00
Automerger Merge Worker
b9e2881321 [automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp am: e1763f51db -s ours
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a084909 is in history

Change-Id: Ie6ff61d44fc3cc8a0b092fbd72fd4bef49c3bcc7
2020-02-24 11:59:27 +00:00
Automerger Merge Worker
8d782dbcf9 Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f am: daaa66f844" into rvc-qpr-dev-plus-aosp 2020-02-24 11:59:23 +00:00
Automerger Merge Worker
c5b1ad9a89 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f am: daaa66f844
Change-Id: I3922aad77de008629f79ed74e86257bfe421de6e
2020-02-24 11:59:19 +00:00
Automerger Merge Worker
1c2d806f69 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f am: 1904c8958e
Change-Id: I1892a7936c6c6ff3551f0f0dc1cec2da818ea21e
2020-02-24 11:59:12 +00:00
Automerger Merge Worker
daaa66f844 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f
Change-Id: If8a72990840ecd5aa74f442a3a15a52d9024bf4b
2020-02-24 11:38:47 +00:00
Automerger Merge Worker
e1763f51db Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp 2020-02-24 11:38:43 +00:00
Automerger Merge Worker
0271fa5b83 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7
Change-Id: Ie13ee289b7b9563fb5ff78ed201fc6d03bcd34eb
2020-02-24 11:38:39 +00:00
Automerger Merge Worker
1904c8958e Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f
Change-Id: Ief0d08c86ba784c9dc33ba053422a1a84c58ee02
2020-02-24 11:38:33 +00:00
Automerger Merge Worker
7ed2795dc7 Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c
Change-Id: Id50dba13c23393c1d5424b4ebff341c910116673
2020-02-24 11:25:07 +00:00
Automerger Merge Worker
33b626bd9f Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c
Change-Id: If1f87ff6dee1fea9662589ce5c33f4726feb5eb3
2020-02-24 11:24:58 +00:00
TreeHugger Robot
520cb5851c Merge "Keep contextual card dismissal info upon deletion" into rvc-dev 2020-02-24 11:07:19 +00:00
Automerger Merge Worker
47641103b4 [automerger skipped] Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp am: 2ec6c2616b -s ours
am skip reason: Change-Id I7501ef393e226bb38c72a1ee465bf9c72586716b with SHA-1 c56ce8d647 is in history

Change-Id: I55bfd417b4ec71bfa038b9d290b41c1542ec9964
2020-02-24 10:34:01 +00:00
Automerger Merge Worker
1d47969b82 Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 04f0c00637" into rvc-qpr-dev-plus-aosp 2020-02-24 10:33:58 +00:00
Automerger Merge Worker
e1436695ef Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 8590506c57" into rvc-qpr-dev-plus-aosp 2020-02-24 10:33:55 +00:00
Automerger Merge Worker
821bc58706 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 04f0c00637
Change-Id: I44974e8c1a394b285fab10b7e31159de00ce2b02
2020-02-24 10:33:54 +00:00
Automerger Merge Worker
221fce2443 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 8590506c57
Change-Id: I447ac5ec7d637d27cf9c1fae34e985fd872c8a74
2020-02-24 10:33:51 +00:00
Automerger Merge Worker
35c33f02c1 [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: a1dad7246d -s ours am: 3e09f3eecb -s ours
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I578811b1bff19754f63de9bb1b8fe202b914168a
2020-02-24 10:33:48 +00:00
Automerger Merge Worker
e4dabac705 Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 am: 555d2019d0
Change-Id: I3a0780a3dd8ad1f1ba6121117e870639842cb1bd
2020-02-24 10:33:37 +00:00
Automerger Merge Worker
c76464421e Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0 am: 5ad696881f
Change-Id: I0fc6b94fe9a1af938ab178fb36fa9d18273ebd71
2020-02-24 10:33:31 +00:00
Automerger Merge Worker
8590506c57 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d
Change-Id: I9248812c45717a9391e2a886b74af5c651234cd7
2020-02-24 10:21:47 +00:00
Automerger Merge Worker
2ec6c2616b Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28" into rvc-d1-dev-plus-aosp 2020-02-24 10:21:47 +00:00
Automerger Merge Worker
3aaa1ed859 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28
Change-Id: I37d0c5f7a89b898fe918bb54fea243802eb48dc1
2020-02-24 10:21:44 +00:00
Automerger Merge Worker
04f0c00637 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d
Change-Id: I33fcd9e6e363c56318aff9f400dffeec6a0576c8
2020-02-24 10:21:41 +00:00
Automerger Merge Worker
555d2019d0 Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0
Change-Id: I98b84a4c485dfda5fb92ffee7ff666be7f843803
2020-02-24 10:21:41 +00:00
Automerger Merge Worker
3e09f3eecb [automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4 am: a1dad7246d -s ours
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4 is in history

Change-Id: I501751f9a7c645da090086ebc94341fd0ea0a821
2020-02-24 10:21:34 +00:00
Automerger Merge Worker
5ad696881f Bluetooth device slice improvement am: 05f5b8e7c4 am: 545c9009b0
Change-Id: Ic0931466231b2068f5eb495204cf78ba88eb72bb
2020-02-24 10:21:28 +00:00
Automerger Merge Worker
43032a4a28 Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b
Change-Id: Ie079b5f6cb03b0d9dad956def4f1c109bddecb10
2020-02-24 10:08:02 +00:00
Automerger Merge Worker
0f8726124d Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b
Change-Id: I231979a8624ea9c06d896baeeb112a8add86e5cb
2020-02-24 10:08:01 +00:00
Automerger Merge Worker
a1dad7246d Bluetooth device slice improvement am: 05f5b8e7c4
Change-Id: Ie82b6e8aacbc92b3e664f488d960b64774898738
2020-02-24 10:07:52 +00:00
Automerger Merge Worker
545c9009b0 Bluetooth device slice improvement am: 05f5b8e7c4
Change-Id: I50406bfcc898110679d99931293553c82eebe5fb
2020-02-24 10:07:35 +00:00
TreeHugger Robot
bdf85c224b Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev 2020-02-24 10:03:53 +00:00
Yanting Yang
5f503b87ea Set ClearDefaultsPreference as unselectable for talkback
ClearDefaultsPreference is a customized preference which contains a
TextView and a Button. In reality, the button is the only thing that the user can interact with. It's a no-op when the user clicks on the whole preference view.
 
Mark the ClearDefaultsPreference as unselectable can fix the talkback
issue for the user clicking on the preference view outside of the button.
 
In the meantime, the button of ClearDefaultsPreference has not applied the button style of Settings yet. Also fixed it by using the ActionPrimaryButton style of Settings.


Fixes: 146471192
Test: visual and robotests
Change-Id: Ife215d0901bd9fc3055495b0495ba175ed0dfa26
Merged-In: Ife215d0901bd9fc3055495b0495ba175ed0dfa26
(cherry picked from commit b9bcbddc46)
2020-02-24 08:41:22 +00:00
govenliu
7d8d8d3400 [Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature.
Issue: Openroaming detail page have new UI Mock.
Solution: Apply the mock design to rollback previous UI and add one Subcription preference.

Bug: 146669261
Test: manually push API and check.
Change-Id: Ie3243c9bcd371db1909834ef257c741454abec11
2020-02-24 15:40:23 +08:00
Yi-Ling Chuang
5f8a084909 Keep contextual card dismissal info upon deletion
Add a config for contextual dismissal. This config is used to
determine whether the existing dismissal timestamp should be
kept before an insertion.

The new dismissal behaviour design replaces the boolean
value(isDismissed) with a long value(dismissedTimestamp) to give
this behaviour more flexibility. Utilizing the timestamp allows
developers to define new criteria of card's display (e.g cards being
dismissed can be shown again after a period of time).

While newly inserted data from SettingsIntelligence or other clients
may not have dismissal timestamp recorded. Turning on the config gives
the capability to persist dismissal timestamp, and more customized
behaviour can be created.

Bug: 143055685
Test: robotests
Change-Id: I9d095955e9c51f2aa3332d49ee230d3ded9ae744
Merged-In: I9d095955e9c51f2aa3332d49ee230d3ded9ae744
(cherry picked from commit 377125bf96)
2020-02-24 07:14:12 +00:00
Raff Tsai
ef009cc832 Fix volume panel crashing
slider position is smaller than min value causes the exception.
Fixed by limit the position within min and max value.

Fixes: 148270968
Fixes: 149973990
Test: manual
Change-Id: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
(cherry picked from commit fcd9f1a870)
Merged-In: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
2020-02-24 07:04:03 +00:00