PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,483 Commits 1 Branch 0 Tags
b23c8335fb4ca07bc3ba41feafc97cecd602aedc
Commit Graph

71483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
b23c8335fb [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours 
am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13122824

Change-Id: I63b84242c8f858bb3abd3d04a64ccb3e3db8d3ac
 2020-12-03 04:25:17 +00:00
TreeHugger Robot
473d899903 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 084b1e0ece -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13154699

Change-Id: Ibe505474c923eb2a548f1516387ec3cde4cfb549
 2020-12-02 18:31:24 +00:00
Bill Yi
b6bb945dac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a86f4b1fc8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13153923

Change-Id: I30ebedab39bbe054f5cfc1e5d2983079be268fe6
 2020-12-02 18:31:16 +00:00
TreeHugger Robot
084b1e0ece Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-02 17:33:31 +00:00
Bill Yi
def7fc914e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id901b94be193bb820bf90a645d7c716497af96dc
 2020-12-02 00:31:42 -08:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
 2020-12-02 00:29:15 -08:00
Bill Yi
a86f4b1fc8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I91b4abf5fc6aa17632203a700fbc0306a231bdf0
 2020-12-01 23:44:15 -08:00
Treehugger Robot
2112d09ac6 Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 am: 0cf0f58ceb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029

Change-Id: I9804a65d41dd36fea23925e62a8958d0808a87c6
 2020-12-01 02:57:03 +00:00
Treehugger Robot
0cf0f58ceb Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029

Change-Id: Ib92cfdb77164a7b24e65b2a028f963b606144096
 2020-12-01 02:41:37 +00:00
Treehugger Robot
4f8b47e5c2 Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." 2020-12-01 01:59:21 +00:00
Joseph Murphy
6d78a33475 Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class. 
Bug: b/174168302
Change-Id: I765e3f6c7f8ef2f2734862e75513e73353fea4c0
 2020-12-01 00:25:00 +00:00
TreeHugger Robot
e2e2607455 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9b7efe7e65 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13140302

Change-Id: I6fc01abdc33861887340313b475b3195e8bd7d28
 2020-11-30 00:59:32 +00:00
TreeHugger Robot
9b7efe7e65 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-11-30 00:56:24 +00:00
TreeHugger Robot
6501f5cef7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 47ec10611a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13140301

Change-Id: Ife76cf99f06d97b73e1a4c71f1048cf8fa601c9e
 2020-11-30 00:48:55 +00:00
TreeHugger Robot
47ec10611a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-11-30 00:44:24 +00:00
Bill Yi
cd97ee0dc7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa52d17990 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13140300

Change-Id: Ibcd465c09efe6a43c0b99fbc54111dde9644fae4
 2020-11-30 00:43:22 +00:00
Bill Yi
083ed222ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3eb3ece2a217721085c78454efaeb28374059b64
 2020-11-29 03:26:43 -08:00
Bill Yi
64801bbc60 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2bc9b3c357b5c05495fa078ce360f334f054f655
 2020-11-29 02:40:29 -08:00
Bill Yi
fa52d17990 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icac16a2140545637a0b86acaca0f97c85492c7a0
 2020-11-29 01:53:13 -08:00
Bonian Chen
69a79dda66 Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f am: d9ba9cf45b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918

Change-Id: I7e23c867d495ae670c975f1f2c8d54fd71ddfeb0
 2020-11-26 08:40:23 +00:00
Bonian Chen
fc69b02cde Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859 am: 80a69cb5e0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917

Change-Id: Iaa5acc6cfdd34acf82c0b20b6016f30963c7b737
 2020-11-26 08:40:08 +00:00
Bonian Chen
d9ba9cf45b Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918

Change-Id: I84f2911036c321bb2129e4df82125c9fe3b54bc7
 2020-11-26 08:24:12 +00:00
Bonian Chen
80a69cb5e0 Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917

Change-Id: I3c19b17b3daa801a4fac4f4cb5742113e3602ba5
 2020-11-26 08:23:25 +00:00
Bonian Chen
967311df7f Merge "[Settings] Reduce the operation of VoLTE config redraw" 2020-11-26 07:35:21 +00:00
Bonian Chen
3c934b2859 Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" 2020-11-26 07:35:00 +00:00
Bonian Chen
f9256b41f2 [Settings] Reduce the operation of VoLTE config redraw 
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I56d4900b5bcb189693c99e870b013da97ed283db
(cherry picked from commit d2e22f4cee)
Change-Id: I92e4b84b81622548fb356a4c7af99668bd2a9e00
 2020-11-26 14:18:25 +08:00
Bonian Chen
9769677a3c [Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case 
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.

Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I8b6a212dc727f1ab78f4dd280cb41966b7054180
(cherry picked from commit 227329b2f7)
Change-Id: I1bd239b6434038323a0689e2bc3bf05182bfcd45
 2020-11-26 13:52:47 +08:00
Treehugger Robot
b03d666b47 Merge "Fix unexpected highlight" am: e763da5884 am: 6e347e61ca 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1490657

Change-Id: Iee515a52a2bd470e2587202427a76826f8ba5f32
 2020-11-25 10:46:22 +00:00
Treehugger Robot
6e347e61ca Merge "Fix unexpected highlight" am: e763da5884 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1490657

Change-Id: I421b2f253178e9adba05fc4ada6a5b7d2e9498f4
 2020-11-25 10:19:53 +00:00
Treehugger Robot
e763da5884 Merge "Fix unexpected highlight" 2020-11-25 09:00:54 +00:00
TreeHugger Robot
88e42134ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7b203b94d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13119748

Change-Id: I53fdaebc933fa943fbb6aef7539935aac8d2218d
 2020-11-24 15:42:48 +00:00
Bill Yi
d912bef0f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84c4c0400b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13119749

Change-Id: I062e7ac2e398cd21f1e94638a46d3067d5a938ee
 2020-11-24 15:42:41 +00:00
TreeHugger Robot
7b203b94d5 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-11-24 15:36:06 +00:00
Bill Yi
84c4c0400b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I924ad03633e508567ba0d58b8784793758ab666f
 2020-11-24 12:46:29 +00:00
Bill Yi
5b2805da81 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iba0e1e93ff77cf74bacf6f73049157826afaca2d
 2020-11-24 12:20:12 +00:00
TreeHugger Robot
d9b1c33aa6 [automerger skipped] Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev am: b115ff305e -s ours 
am skip reason: Change-Id Id2511cb0ad93b44f6bf701a707b7ddef9438653d with SHA-1 bca70dd22d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090677

Change-Id: I587ecdea602390d060d18cb8dd4a14edbade7074
 2020-11-24 09:52:05 +00:00
TreeHugger Robot
b115ff305e Merge "Revert^2 "Update the summary of AoD when Bedtime mode is on"" into rvc-qpr-dev 2020-11-24 06:46:48 +00:00
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
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
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
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
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
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