Treehugger Robot
1e53efc4c4
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Jordan Liu
19d1f890a0
Merge "Allow radio info on phones with no subscription"
2019-08-14 00:22:42 +00:00
Xin Li
c3ef16882d
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
2019-08-13 16:36:39 -07:00
android-build-team Robot
573db8a758
Snap for 5674421 from 4a949c0640 to pi-platform-release
...
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
2019-08-13 16:25:08 +00:00
Jordan Liu
655c1be579
Allow radio info on phones with no subscription
...
Some info is still helpful for debugging in these cases.
Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
Lucas Lin
a64f8d9521
Merge "Create a string for private DNS "On""
2019-07-24 03:15:01 +00:00
lucaslin
be8701bca5
Create a string for private DNS "On"
...
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.
Bug: 79122154
Test: 1. Build pass
2. make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
2019-07-23 19:40:09 +08:00
Treehugger Robot
0c7e805902
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
2019-07-11 00:56:33 +00:00
Xin Li
f03ae69f69
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
...
Bug: 136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
2019-07-09 15:31:44 -07:00
android-build-team Robot
ec58694ae8
Snap for 5622519 from fd365ae91e to pi-platform-release
...
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
2019-07-08 23:29:58 +00:00
Neil Fuller
a931693721
Merge "Add tobiast@ to the OWNERS file"
2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c
Add tobiast@ to the OWNERS file
...
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
Brad Ebinger
11d92e894a
Merge "Allow SimDialogActivity to be started for result"
2019-06-13 20:17:19 +00:00
android-build-team Robot
4a949c0640
Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release
...
Change-Id: I99e4df5bf4f3ea4e98672611976292174b53f507
2019-06-12 09:56:45 +00:00
Raff Tsai
6183b9b1ac
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f9fa8329b02
2019-06-12 09:55:50 +00:00
Jonathan Scott
a945243b5c
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
...
Bug: 127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
(cherry picked from commit 687b18067c
2019-06-12 09:55:46 +00:00
Colin Cross
c56651b345
Merge "Make test_options.timeout an int64"
2019-05-31 03:11:22 +00:00
Colin Cross
06dfd75660
Merge "Convert Settings to Android.bp"
2019-05-30 21:08:37 +00:00
Colin Cross
02ce47c2a1
Make test_options.timeout an int64
...
Test: m RunSettingsRoboTests
Change-Id: I979268540fb50a22316223f432d3c6cbb259f61a
2019-05-30 11:32:07 -07:00
Colin Cross
e0e22cf2a4
Convert Settings to Android.bp
...
See build/soong/README.md for more information.
Test: m checkbuild
Test: m RunSettingsRoboTests
Change-Id: I267534c095c30833f77273dbdb1893b7830ed45d
Merged-In: I267534c095c30833f77273dbdb1893b7830ed45d
2019-05-29 14:45:30 -07:00
Brad Ebinger
fa18b88225
Allow SimDialogActivity to be started for result
...
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.
Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.
Bug: 130853716
Bug: 130567323
Test: run Telephony SmsManagerTestApp
Merged-In: Ib448a6901581294050fc988ed9c16f7e93066860
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
2019-05-22 00:37:21 +00:00
Xin Li
0a8e4aebf5
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."
2019-05-17 00:58:08 +00:00
Xin Li
87f090ba57
DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
...
Bug: 132622481
Change-Id: I3f8a777574eb05716d4ff18e64c9750184de26b6
2019-05-15 16:55:39 -07:00
Xin Li
e6eeb7bd55
DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
...
Bug: 132622481
Change-Id: I812914052b50070b44ac2e2ba573a7146b6cbb78
2019-05-14 10:08:40 -07:00
Xin Li
601dd7f647
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
...
am: d5ce2c2afc
2019-05-09 19:05:15 -07:00
Xin Li
f0acd850fb
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
am: 361819cf69
2019-05-09 16:08:44 -07:00
Xin Li
d5ce2c2afc
Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
2019-05-09 22:05:45 +00:00
Xin Li
361819cf69
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
Bug: 131756210
Change-Id: Ica814624161d8d3cc74a2e5bc9311354767ca255
2019-05-09 09:27:05 -07:00
android-build-team Robot
c54ebfa7e3
Snap for 5450365 from 1fb5b5100d to pi-platform-release
...
Change-Id: I3d469d04b64e6624027ad9e766f0f8c035e6661e
2019-05-07 21:58:21 +00:00
android-build-team Robot
fd365ae91e
Merge cherrypicks of [7316389, 7315812, 7315813, 7316457, 7316055, 7315736, 7316390, 7316458, 7316459, 7316460, 7316561, 7316562, 7316563, 7316564, 7316565, 7316566, 7316567, 7316391, 7315814, 7316548] into pi-qpr3-b-release
...
Change-Id: I6dc39868f631f9bb35be079cbdeb8a5f9f265e30
2019-05-03 10:27:31 +00:00
Ahming Chen
9804cf5b7d
Revert "DO NOT MERGE Refactor passwords/pins/patterns to byte[]"
...
This reverts commit 34042bbf1d
2019-05-03 10:23:05 +00:00
Xiangyu/Malcolm Chen
bb95bb5f8b
Merge "Adding new strings needed for Enable MMS toggle."
...
am: 3c6cb98ec0
2019-05-01 14:58:44 -07:00
Xiangyu/Malcolm Chen
3c6cb98ec0
Merge "Adding new strings needed for Enable MMS toggle."
2019-05-01 20:49:35 +00:00
Malcolm Chen
8b2a07b877
Adding new strings needed for Enable MMS toggle.
...
Bug: 130222866
Test: build
Change-Id: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
Merged-In: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
2019-04-29 14:24:28 -07:00
Mark Chien
7b30503dc4
Merge "Ignore the outdated entitlement check"
...
am: d7885ca73a
2019-04-19 20:26:15 -07:00
Mark Chien
d7885ca73a
Merge "Ignore the outdated entitlement check"
2019-04-20 02:05:33 +00:00
Yiwei Zhang
730c10c93e
Merge changes from topic "GameDriver2"
...
am: 44ab00de7f
2019-04-18 17:40:42 -07:00
Yiwei Zhang
eb5f8b1139
Game Driver: rename GUP to Game Driver
...
am: 046b9a8ca2
2019-04-18 17:39:38 -07:00
Yiwei Zhang
b168f16bfd
Game Driver: Add footer to the dashboard
...
am: 34986f5ba5
2019-04-18 17:38:20 -07:00
Yiwei Zhang
ceb8551cd1
Game Driver: Add SwitchBar to control GUP feature
...
am: b15cc090d1
2019-04-18 17:36:46 -07:00
Yiwei Zhang
c37c07ba99
GUP: Add global switch for all apps
...
am: 75548c4a33
2019-04-18 17:35:09 -07:00
Yiwei Zhang
e506f9d7f5
GUP: Fixed some typos and update some values
...
am: d0bbbfeeea
2019-04-18 17:33:07 -07:00
Yiwei Zhang
f0b7bf7cca
GUP: Display a list of Apps and dialogs
...
am: dc62028e85
2019-04-18 17:30:54 -07:00
Yiwei Zhang
329a5e938e
GUP: Add stub UI
...
am: a2754c515b
2019-04-18 17:28:33 -07:00
Treehugger Robot
44ab00de7f
Merge changes from topic "GameDriver2"
...
* changes:
Game Driver: Fix EnableForAllApps switch and test
Game Driver: rename GUP to Game Driver
Game Driver: Add footer to the dashboard
Game Driver: Add SwitchBar to control GUP feature
GUP: Add global switch for all apps
GUP: Fixed some typos and update some values
GUP: Display a list of Apps and dialogs
GUP: Add stub UI
2019-04-19 00:06:39 +00:00
Yiwei Zhang
9e758e1409
Game Driver: Fix EnableForAllApps switch and test
...
Bug: 123707483
Bug: 119221883
Test: Build, flash, boot and make RunSettingsRoboTests
Change-Id: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5
Merged-In: Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5
2019-04-18 13:40:06 -07:00
Yiwei Zhang
046b9a8ca2
Game Driver: rename GUP to Game Driver
...
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
Merged-In: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
2019-04-18 13:40:04 -07:00
Yiwei Zhang
34986f5ba5
Game Driver: Add footer to the dashboard
...
This change adds a footer to the current dashboard to show some
descriptions when the whole module is turned off.
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: I9788d4c64b06deb099a43e8db7eecab20a85f494
Merged-In: I9788d4c64b06deb099a43e8db7eecab20a85f494
2019-04-18 13:39:17 -07:00
Yiwei Zhang
b15cc090d1
Game Driver: Add SwitchBar to control GUP feature
...
Uncheck the global switch will hide the preference controllers and force
all apps to use system graphics driver. This change also add a content
observer to notify all the preference controllers of settings global
changes.
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ice9ded17c759791a3728c552f79881e2215ac081
Merged-In: Ice9ded17c759791a3728c552f79881e2215ac081
2019-04-18 13:39:08 -07:00
Yiwei Zhang
75548c4a33
GUP: Add global switch for all apps
...
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
Merged-In: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
2019-04-18 13:38:01 -07:00
