Mady Mellor
22c920cc01
Use the Global value rather than the Secure value
...
Fixes: 137876221
Test: manual - have setting in dev options turned off, post a bubble
=> no bubble appears
- have setting in dev options turned on, post a bubble
=> bubble appears
Change-Id: I4490b978059a73b45fa8d09bf28e05965f42eec1
2019-07-18 14:40:04 -07:00
Bill Yi
10ea3f7280
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
...
am: 1f4b32a154
2019-07-18 14:37:11 -07:00
Bill Yi
8e25581401
[automerger skipped] Import translations. DO NOT MERGE
...
am: 56887f467c
2019-07-18 14:36:14 -07:00
Android Build Merger (Role)
aaae63aaa9
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours am: 1f4b32a154 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-18 21:33:57 +00:00
Bill Yi
7355faeb99
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
...
am: 1f4b32a154
2019-07-18 14:33:35 -07:00
Bill Yi
160a6efb72
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
...
am: ad2542c534
2019-07-18 14:33:33 -07:00
Bill Yi
ad2542c534
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
2019-07-18 14:24:36 -07:00
Bill Yi
f36921c04b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 56887f467c
2019-07-18 14:24:36 -07:00
Bill Yi
1f4b32a154
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
2019-07-18 14:24:35 -07:00
Bill Yi
e73e59c562
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
2019-07-18 11:28:21 -07:00
Bill Yi
56887f467c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
2019-07-18 11:07:45 -07:00
Lyn Han
d39e874570
Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev
2019-07-18 14:30:16 +00:00
Kevin Chang
08be6c4a84
Merge "Add footer preference into caption preferences" into qt-r1-dev
...
am: 5fc6db2cf7
2019-07-18 00:53:55 -07:00
Kevin Chang
8c17c2f588
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
...
am: 6bfc381173
2019-07-18 00:53:02 -07:00
Kevin Chang
42f6f19216
Merge "UI change in caption preferences in Settings" into qt-r1-dev
...
am: af447c17b8
2019-07-18 00:52:00 -07:00
Kevin Chang
ada6b6f88e
Merge "Add footer preference into caption preferences" into qt-r1-dev
...
am: 5fc6db2cf7
2019-07-18 00:44:44 -07:00
Kevin Chang
55be763ccd
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
...
am: 6bfc381173
2019-07-18 00:43:52 -07:00
Kevin Chang
2a725532f5
Merge "UI change in caption preferences in Settings" into qt-r1-dev
...
am: af447c17b8
2019-07-18 00:42:38 -07:00
Kevin Chang
5fc6db2cf7
Merge "Add footer preference into caption preferences" into qt-r1-dev
2019-07-18 06:59:47 +00:00
Kevin Chang
6bfc381173
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
2019-07-18 06:59:45 +00:00
Kevin Chang
af447c17b8
Merge "UI change in caption preferences in Settings" into qt-r1-dev
2019-07-18 06:59:41 +00:00
Kevin Chang
5277da96c2
Add footer preference into caption preferences
...
Add footer preference into caption preferences to tell users
that the setting doesn't support all apps.
Reference link of screenshot:
https://drive.google.com/file/d/1VzpWa4M-4HjlfjDNNqrEIKwo3v0y_f51/view?usp=sharing
Bug: 135888603
Test: Visual
Change-Id: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
Merged-In: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
(cherry picked from commit 8f4b8b9a74
2019-07-17 11:28:01 +00:00
Kevin Chang
04dea2b5c2
Add new reminder in "Magnify with shortcut" page
...
Add new reminder string in "Magnify with shortcut" page when
it's under gesture navigation mode.
Reference link of screenshot:
https://drive.google.com/file/d/1uo31FZebhXKcCR8QY_WrgEPiInzARmIl/view?usp=sharing
Bug: 134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Merged-In: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
2019-07-17 11:27:37 +00:00
Kevin Chang
ef9cd2ac95
UI change in caption preferences in Settings
...
Move the switch after the caption preview and change the oreder of the
settings inside in caption preferences in Accessibility settings.
Reference link for screenshot:
https://drive.google.com/file/d/1EQLpfQFnJTwU1F8vLAOSHPYqSXKWL_ap/view?usp=sharing
Bug: 130755332
Test: Visual
Change-Id: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
Merged-In: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
(cherry picked from commit fd1f1c0f82
2019-07-17 11:27:06 +00:00
android-build-team Robot
9ec1a70f95
Snap for 5730727 from 800e8a485f to qt-c2f2-release
...
Change-Id: I47c3ca366f4e47bdd1c75bdf76edd819018e9e46
2019-07-16 03:06:43 +00:00
Antony Sargent
6dd874305e
Make MobileNetworkActivity support onNewIntent
...
The launchMode for MobileNetworkActivity specified in the android
manifest is "singleTask", which means that when an intent to it is
launched, if there is an existing instance we will reuse that instead of
creating a new one. But to handle this properly we need to know when it
happens by implementing onNewIntent, which we weren't doing.
Implementing this fixes a bug we noticed that if you have multiple SIMs
and recently visit the details page for SIM 1 but then click on a SIM
selection notification that should bring you to the details for SIM 2,
we'd just bring up the details page for SIM 1 again.
Fixes: 133447239
Test: make RunSettingsRoboTests
Change-Id: Ia9106b15ffde437f6dd6fd2da23336ec5b28f75e
2019-07-15 17:11:19 -07:00
Lyn Han
c44efcb3e4
Secure => global bubble settings pt 2
...
Follow up to http://ag/8222583
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
Fixes: 136034310
Bug: 129158983
Test: m RunSettingsRoboTests
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: Ifa71206353237b837cfcda6d23ea6a6ec2c146d0
2019-07-15 13:51:18 -07:00
Joshua Mccloskey
05648f64de
Merge "Fixed Settings Crash" into qt-r1-dev
...
am: 800e8a485f
2019-07-15 13:12:46 -07:00
Joshua Mccloskey
d5cac4a3f6
Merge "Fixed Settings Crash" into qt-r1-dev
...
am: 800e8a485f
2019-07-15 13:10:52 -07:00
Joshua Mccloskey
800e8a485f
Merge "Fixed Settings Crash" into qt-r1-dev
2019-07-15 19:40:23 +00:00
Lyn Han
bb81e0660d
Merge "Revert "Secure => global bubble settings pt 2"" into qt-r1-bubbles-dev
2019-07-15 18:43:44 +00:00
Lyn Han
ca77022900
Revert "Secure => global bubble settings pt 2"
...
This reverts commit a978ab4526
2019-07-15 18:06:32 +00:00
TreeHugger Robot
51eeea8680
Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev
2019-07-15 18:04:34 +00:00
Android Build Merger (Role)
4919b857e6
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours am: 09be23ffaa -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-15 08:28:50 +00:00
Bill Yi
7d98d178e9
[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
...
am: 09be23ffaa
2019-07-15 01:28:32 -07:00
Bill Yi
d6c2681911
[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
...
am: 09be23ffaa
2019-07-15 01:28:12 -07:00
Bill Yi
5a71e96c3a
[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
...
am: 7903044b2b
2019-07-15 01:28:12 -07:00
Bill Yi
09be23ffaa
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8d229d7090
2019-07-15 01:21:17 -07:00
Bill Yi
7903044b2b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8d229d7090
2019-07-15 01:21:16 -07:00
Bill Yi
8d229d7090
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
2019-07-14 22:26:37 -07:00
Bill Yi
d1002fc748
[automerger skipped] Import translations. DO NOT MERGE
...
am: 941e94d689
2019-07-14 21:51:26 -07:00
Bill Yi
6b16484afd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 941e94d689
2019-07-14 21:40:54 -07:00
Bill Yi
941e94d689
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id33f437d9b802519be1544de7616b3a5b0528680
2019-07-13 22:19:58 -07:00
android-build-team Robot
1a9f571ace
Snap for 5726890 from 44f731c1c7 to qt-c2f2-release
...
Change-Id: I537bb914cdeac1f821619ad7c954f77aca69bf67
2019-07-13 23:06:35 +00:00
joshmccloskey
6a3012f21d
Fixed Settings Crash
...
Fixes: 137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
2019-07-12 15:49:24 -07:00
Lyn Han
a978ab4526
Secure => global bubble settings pt 2
...
Follow up to http://ag/8222583
- Replace references to Secure.NOTIFICATION_BUBBLES with
Global.NOTIFICATION_BUBBLES
Fixes: 136034310
Bug: 129158983
Test: atest SystemUITests
Test: manual - work profile bubbles show up
Change-Id: I03ffd7f1126f2c20d819f741cd4f7dcced81a405
2019-07-12 11:32:39 -07:00
android-build-team Robot
6d7f8afe65
Merge cherrypicks of [8558068, 8558825, 8558826, 8558827, 8557109, 8558018, 8558886, 8558887, 8558888, 8558889, 8558071, 8558072, 8556231] into qt-release
...
Change-Id: Id07c91777f0b9ff3283ff1dfc53b5e1680c5f2f0
2019-07-12 04:11:18 +00:00
Android Build Merger (Role)
7d92e3d2a2
Merge "Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857 am: 8c6b2bafb0" into qt-r1-dev-plus-aosp
2019-07-12 04:11:01 +00:00
Andrew Sapperstein
b07cee3139
Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
...
am: 44f731c1c7
2019-07-11 21:10:41 -07:00
Andrew Sapperstein
07b41c6055
Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
...
am: 8c6b2bafb0
2019-07-11 21:10:39 -07:00
