PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,100 Commits 1 Branch 0 Tags
e98a5a99323bee0a55e5895654dd5422e03fb79c
Commit Graph

80100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
7d86bc9ca9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e2ee9d02f5 -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: I4520d3b4cd60d8c10a0c6347edff34facd505308
 2020-11-19 19:04:50 +00:00
TreeHugger Robot
dd0972234c Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-11-19 18:56:22 +00:00
Fan Zhang
9ce66c865d Merge "Add a setting to overrid emergency number for Emergency SOS" 2020-11-19 18:53:00 +00:00
TreeHugger Robot
9ac2df26e2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-11-19 18:36:44 +00:00
TreeHugger Robot
5972991285 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-11-19 18:32:49 +00:00
TreeHugger Robot
e2ee9d02f5 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-11-19 18:17:44 +00:00
Weng Su
f0b9dc570b [Provider Model] Add Internet preference to replace Wi-Fi preference 
- Change title from "Wi-Fi" to "Internet"
- Remove Wi-Fi switch
- Screenshot:
  https://screenshot.googleplex.com/9tmXYQXKSsuGwEY
  https://screenshot.googleplex.com/5uMCeruXsX3gP9j

Bug: 172295984
Test: manual test
  atest -c InternetPreferenceControllerTest
  make RunSettingsRoboTests ROBOTEST_FILTER=NetworkDashboardFragmentTest
Change-Id: Ie4a3c9aff45fbe7b28594afc9c603e6df57300bf
 2020-11-19 14:51:56 +00:00
Jakub Pawlowski
4f7edf692f Prevent overlay drawing on top of Bluetooth activity dialog 
Bug: 168504491
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
 2020-11-19 13:47:53 +01:00
Sarah Chin
f06975c784 [automerger skipped] Merge "Update signal strength on ServiceState in service" am: 3169b21b4e am: 4928687552 am: a86bc76ef9 -s ours am: de7bf28a18 -s ours 
am skip reason: Change-Id Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7 with SHA-1 62efb18365 is in history

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

Change-Id: I8a9b4c702c3e52355a8dcf5a637141e0d49dfdab
 2020-11-19 10:31:40 +00:00
Chris Manton
1951d27669 Add bluetooth package to permission request intent 
Limit the component that may resolve this intent to the
bluetooth package.

Bug: 158219161
Test: Security Fix
Tag: #security
Change-Id: If732f940a7aa256f5975349118e8eb6cf5584676
 2020-11-19 10:20:24 +00:00
Sarah Chin
de7bf28a18 [automerger skipped] Merge "Update signal strength on ServiceState in service" am: 3169b21b4e am: 4928687552 am: a86bc76ef9 -s ours 
am skip reason: Change-Id Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7 with SHA-1 62efb18365 is in history

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

Change-Id: Ia11e13192dbef00b7071a9f4d9a3cd47caa5a58a
 2020-11-19 10:05:57 +00:00
Sarah Chin
a86bc76ef9 Merge "Update signal strength on ServiceState in service" am: 3169b21b4e am: 4928687552 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: I908564533b6813aeffe1ed57ef0416dd7f1fce25
 2020-11-19 09:52:29 +00:00
Sarah Chin
4928687552 Merge "Update signal strength on ServiceState in service" am: 3169b21b4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: I33153c2891cd16bd4f4cb2d5e792aa20154226b9
 2020-11-19 09:40:30 +00:00
Sarah Chin
3169b21b4e Merge "Update signal strength on ServiceState in service" 2020-11-19 09:17:18 +00:00
Sarah Chin
99aad232be Update signal strength on ServiceState in service 
Test: make RunSettingsRobotTests
Bug: 167643728
Change-Id: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
Merged-In: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
(cherry picked from commit 3b3704d693)
 2020-11-19 00:11:36 -08:00
Wesley.CW Wang
f1a168021d Add Battery Defender strings to Settings am: 6117acedb0 am: e0429fdeea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13053209

Change-Id: Ice15b301e5d6b0af7ad08c172488dd4e09bad8b2
 2020-11-19 07:07:42 +00:00
Wesley.CW Wang
e0429fdeea Add Battery Defender strings to Settings am: 6117acedb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13053209

Change-Id: I3077301357b48298cf018c23ec4b738808c3deea
 2020-11-19 06:55:03 +00:00
Wesley.CW Wang
6117acedb0 Add Battery Defender strings to Settings 
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: I44f669879a4cb141d3107f77c6a78a1a4406e37c
 2020-11-19 06:43:06 +00:00
Alex Li
9765ee030a Merge "[Settings] Removes to use setup compat's button margin since the attribute has been removed." 2020-11-19 05:52:25 +00:00