Commit Graph

23495 Commits

Author SHA1 Message Date
Tom Hsu
ffd1ed3e8b Merge "[Provider Model] Internet Picker implementation." 2020-11-26 02:38:33 +00:00
Alex Stetson
c62327981e Allow extended apps to change package name
For the added flexibility of allowing apps that extend from settings to
have a different package name, these instances of com.android.settings
as a xmlns need to be replaced with res-auto (which subsitutes the
package name at build time).

Bug: 174264676
Test: manual (sdk_gphone), make -j20 SettingsRoboTests
Change-Id: I03acda25dbf4d028cc73b77f41ad5dedca110ecb
2020-11-25 14:28:25 -08:00
TreeHugger Robot
301603dfe3 Merge "[Settings] init UI entry for Cross SIM calling" 2020-11-25 17:14:40 +00:00
Bonian Chen
0bff334632 [Settings] init UI entry for Cross SIM calling
Create an empty UI entry for Cross SIM calling.

TODO: fill-in implementation based on UI within document.

Document:
https://docs.google.com/document/d/1INEwrq5_M62hJcRMshdO0OaFruVR0goYByxdpMdFr_o/edit?disco=AAAAHQo7ang&ts=5fadc9b4&usp_dm=true#heading=h.8gw4a7e503pz

Bug: 174012397
Test: manual
Change-Id: I344a18954924c4665295ef244bfee773f3f98d55
2020-11-25 15:51:08 +00:00
TreeHugger Robot
3b95bd6792 Merge "Apply banner message for night light page" 2020-11-25 05:35:14 +00:00
Weng Su
378eb869ad [Provider Model] Saved networks Settings UI change
- Change sub-title to “OTHER NETWORKS”

- Screenshot
  https://screenshot.googleplex.com/35k9YjnrN3wkSHh

Bug: 172788849
Test: manual test
Change-Id: Ib41b0e7955f9afdfb74343adad5883bb89c3f03b
2020-11-24 18:14:18 +00:00
TreeHugger Robot
4a921534ef Merge "Apply top intro preference for app pinning feature" 2020-11-24 16:17:07 +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
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
Fan Zhang
c571cb42b9 Fix a typo
Fix: 174043156
Test: manual
Change-Id: If1f693d77e4e1eebe58f5f2d23350e6b968e8540
2020-11-23 10:48:33 -08: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
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
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
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
TreeHugger Robot
7529dc6307 Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" 2020-11-20 05:26:24 +00:00
TreeHugger Robot
d941a2c60a Merge "Revert "Import translations. DO NOT MERGE ANYWHERE"" 2020-11-20 04:35:53 +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
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
Fan Zhang
bab12ec15b Merge "Update emergency sos gesture string to match mock" 2020-11-19 20:33:32 +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
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
Yi-yo Chiang
d69b381ab1 Revert "Update the summary of AoD when Bedtime mode is on" am: cd4a35de8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13082204

Change-Id: Ief1b70558800858ac67c0857e562740ae5d42142
2020-11-19 05:22:14 +00:00
Yi-yo Chiang
cd4a35de8e Revert "Update the summary of AoD when Bedtime mode is on"
Revert "Update the summary of Idle lock screen when Bedtime mode..."

Revert submission 13071396-cherrypick-cherrypick-bedtime-hpxwlbiuim-0q85x8kaar

Reason for revert: Broken test b/173663404

Reverted Changes:
Id2511cb0a:Update the summary of AoD when Bedtime mode is on
I041599b9c:Update the summary of Idle lock screen when Bedtim...

Bug: 173663404
Change-Id: I9bea7499393d3ab1733b82140942499dddd9a2aa
Merged-In: I3b7053ad752f548f421dcca10cc1203500b1220b
2020-11-19 04:32:44 +00:00
Bill Yi
cc005a967f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8e58e7ed90ef101fe6b825332ad161029df5936e
2020-11-19 03:47:04 +00:00
Bill Yi
cd85b068c2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24ae0a34645982b76c9c9ccf397820d24d9c8aa8
2020-11-19 03:46:48 +00:00
Bill Yi
8b25a82f5e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id2f5d0139538bb1a6ede6367bf32209e2dd52110
2020-11-19 03:46:40 +00:00
Bill Yi
fc3b543d7d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5f92e547137795cfcda635fe9c8f712a953a449c
2020-11-19 03:46:24 +00:00
alexylli
361a52cce7 [Settings] Removes to use setup compat's button margin since the attribute has been removed.
Test: mm
Bug: 173578478
Change-Id: Id03a9dbcf070d4b8214b31ec5a672e9dd5b327d5
2020-11-19 09:25:04 +08:00