Edgar Wang
c5dfd3eb76
Revert^2 "Update the summary of AoD when Bedtime mode is on"
...
Since Bedtime mode can suppress AoD, after reviewed by UX, we decide
update the summary to "Unavailable because Bedtime mode is on" when AoD
is suppressed by Bedtime mode.
Bug: 168790245
Test: manual & robotest
Change-Id: I96b401bcba213598344c4c4f01b12c275304b809
Merged-In: Id2511cb0ad93b44f6bf701a707b7ddef9438653d
2020-11-24 05:34:49 +00:00
tim peng
2a6ffedfee
Merge "Redirect to output switcher panel to the new dialog"
2020-11-24 01:18:08 +00:00
Fan Zhang
66e0dfe78f
Merge "Fix a typo"
2020-11-23 20:44:30 +00:00
Sarah Chin
af59e706d0
[automerger skipped] Merge "Update ICC lock API methods" am: bf2a6d1e11
am: 690de7e76e
am: a17907084e
-s ours
...
am skip reason: Change-Id Ia4ba222dfa7d7756a3675f75b3467d0265967516 with SHA-1 536cb60c65
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478
Change-Id: Ia6407ef8769ab5fd902cdf9007309823380859b6
2020-11-23 19:29:24 +00:00
Sarah Chin
a17907084e
Merge "Update ICC lock API methods" am: bf2a6d1e11
am: 690de7e76e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478
Change-Id: Ia8a96a3271de030b6ebe6dc40c734d75887baa0a
2020-11-23 18:50:26 +00:00
Fan Zhang
c571cb42b9
Fix a typo
...
Fix: 174043156
Test: manual
Change-Id: If1f693d77e4e1eebe58f5f2d23350e6b968e8540
2020-11-23 10:48:33 -08:00
Sarah Chin
690de7e76e
Merge "Update ICC lock API methods" am: bf2a6d1e11
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478
Change-Id: Ia11d5dd7bd456bb0bc51078aeee97a166ca39e77
2020-11-23 18:17:48 +00:00
Sarah Chin
bf2a6d1e11
Merge "Update ICC lock API methods"
2020-11-23 17:50:19 +00:00
Ioana Stefan
a218bc05e6
Add IME tracing to data gathered in WinscopeTrace
...
This change starts and stops IME tracing together with the other traces
gathered when the WinscopeTrace tile is used. The data is saved along
the other traces in /data/misc/wmtrace/.
Bug: 154348613
Bug: 167948910
Test: flash a device together with the other change in this topic
enable the WinscopeTrace tile and do some actions
disable the WinscopeTrace tile
do a bugreport and visualise contents in Winscope
or just check contents of /data/misc/wmtrace/ through adb
Change-Id: If0b16dd5c19aa8bb33174abe2fe242fc8e6bdd90
2020-11-23 10:53:29 +00:00
tom hsu
329d753a29
[Provider Model] Internet Picker implementation.
...
Show mobile network on internet page
With mobile network
- https://screenshot.googleplex.com/7HzGhnbpitErynY
Without mobile network
- https://screenshot.googleplex.com/8sNVggTpKEhKeRh
Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf
Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448
Bug: 173105859
Test: atest NetworkMobileProviderControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed
Change-Id: I9671a0b85aad1dd2f53772539505b0ad96edbda3
2020-11-23 15:55:40 +08:00
timhypeng
82d45fa032
Redirect to output switcher panel to the new dialog
...
-Redirect for Cast button
-Send intent when call MediaOutputPanel::create()
-Return null to finish the activity
Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Change-Id: I1038e237113f433c847aff98a45b1dd6089d80a8
2020-11-23 03:32:30 +00:00
Zoey Chen
167207bbd1
Merge "[Provider Model] Implement Calls & SMS fragment test case"
2020-11-23 02:30:31 +00:00
TreeHugger Robot
c17fc22c4e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-11-22 15:43:22 +00:00
Bill Yi
4ea71b96e0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ica2165bdbb29665d84866829f1a73c9e152ff087
2020-11-21 18:13:55 -08:00
TreeHugger Robot
c48eacaa82
Merge "Revert "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent"""
2020-11-21 03:27:14 +00:00
Lucas Dupin
56cb882b38
Use theme color instead of fixed one
...
Notifications don't have fixed background anymore, their colors
are themed based on a dynamic system palette.
Test: manual
Bug: 173561906
Bug: 173561901
Change-Id: Id0a41e04fe3e27d2ae59ab5c61a174211278c4a7
2020-11-21 00:09:51 +00:00
Mill Chen
467ae5ffc2
Revert "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent""
...
This reverts commit 13ebec46a5
.
Reason for revert: To fix the NPE issue
Specify explicitly FLAG_MUTABLE for PendingIntent
This change is to specify explicitly FLAG_MUTABLE to the pendingIntent
since this intent is working with inline reply.
Bug: 172894032
Test: manual test
Change-Id: I5fdcf175307cec5e0e96b33d711221be839e1357
2020-11-21 00:16:58 +08:00
Zoey Chen
61ea59ab30
[Provider Model] Implement Calls & SMS fragment test case
...
New test case: NetworkProviderCallsSmsFragmentTest
Modify the key of preference
Bug: 172053880
Test: manual & atest -c NetworkProviderCallsSmsFragmentTest
Change-Id: I218aaf1194898e70b2118428c1ea5a389d85d036
2020-11-21 00:06:47 +08:00
Yanting Yang
2d09dab424
Merge "Rename the title for the apps settings tile in silky home"
2020-11-20 15:15:15 +00:00
Zoey Chen
8bf601278d
Merge changes I55d218d4,I86e9fc71
...
* changes:
[Provider Model] Implement Calls & SMS fragment
[Provider Model] Implement Calls & SMS controller
2020-11-20 10:25:01 +00:00
Tsung-Mao Fang
f7e5b68b96
Apply banner message for night light page
...
Test: See the screen
Bug: 173184155
Change-Id: I522b5fbc48bed05ff621d914ae8b38d291fceab5
2020-11-20 09:14:46 +00:00
Yanting Yang
fa8591ed2e
Rename the title for the apps settings tile in silky home
...
Bug: 168166015
Test: robotest & visual with turning on/off silky home
Change-Id: Ic11304122cfb97d670c64dd88af4112f541d7a63
2020-11-20 16:52:33 +08:00
Zoey Chen
794306c6cb
[Provider Model] Implement Calls & SMS fragment
...
It a whole new fragment that show calls preference, sms preference and Wi-Fi calling.
New fragment: NetworkProviderCallsSmsFragment
New controller: NetworkProviderWifiCallingPreferenceController (ag/12965657)
Old controllers: CallsDefaultSubscriptionController and SmsDefaultSubscriptionController
Screenshot of Provider Model: https://screenshot.googleplex.com/4NiK9AKsH4D8kkt.png
Screenshot of current: https://screenshot.googleplex.com/BtCgYmnpvT97SQs.png
Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448
Bug: 172053880
Test: manual
Change-Id: I55d218d4dd6b6c268a4ee7e369b3e03dfcabd71d
2020-11-20 08:21:44 +00:00
TreeHugger Robot
11ae925fa4
Merge "Revert "Import translations. DO NOT MERGE ANYWHERE""
2020-11-20 08:18:08 +00:00
Zoey Chen
cda7efb94d
[Provider Model] Implement Calls & SMS controller
...
Screenshot of Provider Model:
Single SIM:
https://screenshot.googleplex.com/4pGBU7XK55CwJ7o.png
Dual SIM:
https://screenshot.googleplex.com/bXaFjsfGkgyHoYF.png
Screenshot of current: https://screenshot.googleplex.com/BtCgYmnpvT97SQs.png
Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448
New controller: NetworkProviderCallsSmsController
Bug: 172053880
Test: manual
Change-Id: I86e9fc71d2b8562d838c5b5c6bd9c443656e2624
2020-11-20 15:43:04 +08:00
Mill Chen
1ad41f5b39
Merge "Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent""
2020-11-20 07:39:41 +00:00
Zoey Chen
006fc3486b
Merge "[Provider Model] Implement Wi-Fi callings in Calls & SMS"
2020-11-20 06:54:42 +00:00
TreeHugger Robot
391d1278fa
Merge "Revert "Import translations. DO NOT MERGE ANYWHERE""
2020-11-20 05:33:33 +00:00
TreeHugger Robot
7529dc6307
Merge "Revert "Import translations. DO NOT MERGE ANYWHERE""
2020-11-20 05:26:24 +00:00
Zoey Chen
fa2417aaac
[Provider Model] Implement Wi-Fi callings in Calls & SMS
...
NetworkProviderWifiCallingPreferenceController is a catrgory of WFC.
It will add NetworkProviderWifiCallingGroup for SIMs which is WFC enabled dynamically.
Implement the current WFC logic: WifiCallingPreferenceController, for Provider Model
Diff with WifiCallingPreferenceController
https://diff.googleplex.com/#key=nzCL6Ybrkr19
Screenshot of Provider Model:
https://screenshot.googleplex.com/BCXxdo4iNh6M3tH.png
Screenshot of current WifiCallingPreferenceController:
https://screenshot.googleplex.com/BsBE3A5YRs6arw9.png
Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448
Bug: 172053880
Test: manual & atest -c NetworkProviderWifiCallingPreferenceControllerTest & atest -c NetworkProviderWifiCallingForSubTest
Change-Id: I6f4b4a257bc5e94be3090445ccabbcb261a03730
2020-11-20 12:54:40 +08:00
Sarah Chin
bbfd9bdb3f
[automerger skipped] Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260
am: 04b9046ec6
am: caa76d8261
am: 111a371005
-s ours
...
am skip reason: Change-Id Ib78149c41612d56a46974621eb71b5e0cfe97c5a with SHA-1 7f2a6040ef
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517
Change-Id: I2ccada7e31d2b2b8e1a11189602a194544ed2284
2020-11-20 04:50:31 +00:00
TreeHugger Robot
bcc27e5847
[automerger skipped] Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" into rvc-qpr-dev am: 1e1c7c1b0e
-s ours am: 5c0a32c3de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13094553
Change-Id: Ie237b0ccaf65267570f54ff8ef12f65924a8f32c
2020-11-20 04:50:07 +00:00
Sarah Chin
111a371005
Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260
am: 04b9046ec6
am: caa76d8261
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517
Change-Id: I3305ed2659027a109672c10a06b70300c66ba80e
2020-11-20 04:43:00 +00:00
TreeHugger Robot
d941a2c60a
Merge "Revert "Import translations. DO NOT MERGE ANYWHERE""
2020-11-20 04:35:53 +00:00
TreeHugger Robot
5c0a32c3de
[automerger skipped] Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" into rvc-qpr-dev am: 1e1c7c1b0e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13094553
Change-Id: I5bda8d3f4f4cb3b67f8053b623b3a68e32c2a22e
2020-11-20 04:19:17 +00:00
Sarah Chin
caa76d8261
Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260
am: 04b9046ec6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517
Change-Id: I8780119041580b96c823b76ba944599484ac317f
2020-11-20 04:08:18 +00:00
TreeHugger Robot
1e1c7c1b0e
Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" into rvc-qpr-dev
2020-11-20 04:02:14 +00:00
Sarah Chin
04b9046ec6
Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517
Change-Id: I5d299e2907e204ffccbe898eef0c508b1e518bb0
2020-11-20 03:33:18 +00:00
Mill Chen
13ebec46a5
Revert "Specify explicitly FLAG_IMMUTABLE for PendingIntent"
...
This reverts commit 9cbb4fa4e7
.
Reason for revert: this change might cause NPE on Settings app.
Change-Id: I4fd5ec36941c7516a25eaff6d64bcf62e0de7b39
2020-11-20 03:27:35 +00:00
Bill Yi
6e41988125
Revert "Import translations. DO NOT MERGE ANYWHERE"
...
This reverts commit 8b25a82f5e
.
Reason for revert: Incorrect import
Change-Id: I235720896e24cc436082b727e103e12d6cc5935f
2020-11-20 03:20:28 +00:00
Bill Yi
36dff8407c
Revert "Import translations. DO NOT MERGE ANYWHERE"
...
This reverts commit cd85b068c2
.
Reason for revert: Incorrect import
Change-Id: I0babf6fb721de7bb3201c28280b74488e0744b08
2020-11-20 03:16:59 +00:00
Weng Su
be9235c082
Merge "[Provider Model] Add Internet preference to replace Wi-Fi preference"
2020-11-20 03:11:06 +00:00
Bill Yi
dbe976787f
Revert "Import translations. DO NOT MERGE ANYWHERE"
...
This reverts commit 8b25a82f5e
.
Reason for revert: Incorrect import
Change-Id: Idfce670ea683eb594569d099c98f0b90a809c5b4
2020-11-20 03:07:26 +00:00
Bill Yi
f66da3d058
Revert "Import translations. DO NOT MERGE ANYWHERE"
...
This reverts commit cc005a967f
.
Reason for revert: Incorrect import
Change-Id: I80e22b4ce5050a2ea58dae5b1f18b333843f8c85
2020-11-20 03:05:15 +00:00
Bill Yi
1aa452a6f7
Revert "Import translations. DO NOT MERGE ANYWHERE"
...
This reverts commit fc3b543d7d
.
Reason for revert: Incorrect import
Change-Id: I0d37e83fe5cc4ee8e55a303e38e89dcd1fb7d872
2020-11-20 02:57:59 +00:00
Sarah Chin
b26cf2d260
Merge "Update setCdmaRoaming/SubscriptionMode APIs"
2020-11-20 02:45:35 +00:00
Sarah Chin
e962520266
Update ICC lock API methods
...
Test: atest TelephonyManagerTest
Bug: 171884262
Change-Id: Ia4ba222dfa7d7756a3675f75b3467d0265967516
Merged-In: Ia4ba222dfa7d7756a3675f75b3467d0265967516
2020-11-19 15:04:12 -08:00
Sarah Chin
ce9fda5a60
Update setCdmaRoaming/SubscriptionMode APIs
...
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
Merged-In: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-19 14:46:37 -08:00
Fan Zhang
bab12ec15b
Merge "Update emergency sos gesture string to match mock"
2020-11-19 20:33:32 +00:00
TreeHugger Robot
9f1e79041d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e2ee9d02f5
-s ours am: 7d86bc9ca9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13086497
Change-Id: I76168d0d49f5a5fac9f73b3516ccf1e1de60a8be
2020-11-19 19:25:02 +00:00