PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,282 Commits 1 Branch 0 Tags
c0e7328a88e2bc36d66eb655feaae252baeb18f8
Commit Graph

78282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Yi-yo Chiang
077ad80267 [automerger skipped] Revert "Update the summary of AoD when Bedtime mode is on" am: cd4a35de8e am: d69b381ab1 -s ours 
am skip reason: Change-Id I3b7053ad752f548f421dcca10cc1203500b1220b with SHA-1 b3e597f239 is in history

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

Change-Id: I47b507d5c3aec8071d5fed7c9a7814a1bb243a19
 2020-11-19 05:43:56 +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
SongFerng Wang
401a4d582d Merge "[Testcase] To migration CarrierPreferenceControllerTest" 2020-11-19 05:05:54 +00:00
John Li
d9fa3cec61 Merge changes from topic "haptic" 
* changes:
  Add haptic feedback for the seekbar in Settings.
  Perform haptic feedback when the seekbar snaps.
 2020-11-19 04:54:51 +00:00
SongFerng Wang
aa76ca4beb Merge "[Testcase] To migration DeleteSimProfilePreferenceControllerTest" 2020-11-19 04:53:54 +00:00
SongFerng Wang
7a8d10953f Merge "[Testcase] To migration MobileNetworkSwitchControllerTest" 2020-11-19 04:51:47 +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
TreeHugger Robot
8c6e967e4c Merge "CustomSliceable.getBroadcastIntent should use FLAG_MUTABLE" 2020-11-19 02:20:56 +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
Fan Zhang
83275f2091 Add a setting to overrid emergency number for Emergency SOS 
- Add a dialog preference and custom dialog to allow user input a phone
  number
- Use settingslib/emergencynumber util to set/get the user input into
  SettingsProvider

https://screenshot.googleplex.com/A9GmJrcSbp4jYfd.png

Bug: 172609395
Test: robotests
Change-Id: Iedd9bb9f32c212a310fd8fddffad852a997f3b0d
 2020-11-18 14:59:14 -08:00
Edgar Wang
b3e597f239 [automerger skipped] Update the summary of AoD when Bedtime mode is on am: bca70dd22d am: 5cbd47e127 -s ours 
am skip reason: Change-Id Id2511cb0ad93b44f6bf701a707b7ddef9438653d with SHA-1 391217977f is in history

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

Change-Id: I3b7053ad752f548f421dcca10cc1203500b1220b
 2020-11-18 21:40:08 +00:00
Edgar Wang
5cbd47e127 Update the summary of AoD when Bedtime mode is on am: bca70dd22d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13071396

Change-Id: Iec1aab3948340fe7870a5960c6f0ddb4536c6c93
 2020-11-18 21:27:46 +00:00