PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,339 Commits 1 Branch 0 Tags
f1489b51a3b5044f0211c2fa91777816284a8775
Commit Graph

79339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
7d5483f6d7 Merge "Enhanced4gLteSliceHelper specifies immutable intent" 2020-12-21 07:25:30 +00:00
TreeHugger Robot
fd6645be76 Merge "[Provider Model] Add “Airplane-safe networks” icon" 2020-12-21 06:28:42 +00:00
Jeremy Goldman
8320f7459b Merge "DataUsageSummaryPreferenceTest converted to JUnit" 2020-12-21 06:21:22 +00:00
tim peng
10ee127203 Merge changes Iecf987cc,Ibbbb9e78 
* changes:
  Remove unused variable
  Remove MediaOutputPanel and MediaOutputSlice
 2020-12-21 06:12:08 +00:00
Jeremy Goldman
50dd14d111 Enhanced4gLteSliceHelper specifies immutable intent 
Bug: 172812686
Fixes: 172207848
Test: atest -c Enhanced4gLteSliceHelperTest
Change-Id: I1bfac82e3ce5c66639465befb0517839fb55415e
 2020-12-21 05:41:01 +00:00
Jeremy Goldman
e068542f53 SimStatusDialogControllerTest converted to JUnit 
Bug: 175389659
Test: atest -c SimStatusDialogControllerTest
Change-Id: Id2cfb01714f1756f9251b2319d83a1609488b0f6
 2020-12-21 04:45:13 +00:00
Jeremy Goldman
ae03dd39da DataUsageSummaryPreferenceTest converted to JUnit 
There are couple of newly explored concepts in this CL, which will
hopefully be useful for migrating other tests in the future as well. In
broad strokes, the changes to this file cover:

Android build file species the preferences library, in order to access
PreferenceViewHolder.createInstanceForTests.
Resource ids in JUnit tests differ from the Settings apk. This is true
not only of strings but also views and layouts. Helper functions added
to main class to access the layouts needed by the test.
Shadow activities are not needed to view layouts, the context can be
used.
Context startActivity can be mocked and verified in order to capture and
examine the intent created by the library under test.

Bug: 175389659
Test: atest -c DataUsageSummaryPreferenceTest
Change-Id: Ib8cb87f0299c47a32c3f5d3af7edb20592b727ec
 2020-12-21 12:39:02 +08:00
timhypeng
7c86980bf3 Remove unused variable 
-remove VIEW_TYPE_SLIDER_LARGE_ICON
-remove MEDIA_OUTPUT_GROUP_SLICE_URI
-remove MEDIA_OUTPUT_SLICE_URI

Bug: 175850711
Test: build pass
Change-Id: Iecf987cc91934a7598762523814f5f575302dde2
 2020-12-21 03:23:32 +00:00
Treehugger Robot
8fca3deb38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours am: 892c868c32 -s ours am: d957a89de0 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e58993eeb4229ec7ddf088778f37418584c9155
 2020-12-20 19:52:59 +00:00
Treehugger Robot
061e34868a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours am: b5a0cf9253 -s ours am: bfdcddcf09 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6c16a99aa5bd83a769a69973ca76b83279f12ed
 2020-12-20 19:52:32 +00:00
Treehugger Robot
d957a89de0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours am: 892c868c32 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37322ca133d1d962d783781425f0b7296183151c
 2020-12-20 19:25:30 +00:00
Treehugger Robot
bfdcddcf09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours am: b5a0cf9253 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced1762798a3b2ed8f994e4bab4379b353ae877b
 2020-12-20 19:24:54 +00:00
Treehugger Robot
892c868c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d0be7ca05 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica30d902800493f8a4f5d36365de2d4dca8e77b7
 2020-12-20 19:11:29 +00:00
Treehugger Robot
b5a0cf9253 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ae81b2084 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17af19488236d2b4376dc523c06c5ea27c67b616
 2020-12-20 19:07:31 +00:00
Treehugger Robot
3d0be7ca05 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:43:29 +00:00
Treehugger Robot
5ae81b2084 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:38:59 +00:00
Bill Yi
cb8819b42f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
 2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
 2020-12-20 12:14:03 +00:00
TreeHugger Robot
52c92487d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fbe124ac1d -s ours am: 66cab67fd9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f8189f4a516855eb50d232768750ececb105906
 2020-12-19 17:06:01 +00:00
TreeHugger Robot
66cab67fd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fbe124ac1d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefbabc4c1b931ebc3e6402481dd970707e6905d1
 2020-12-19 16:52:51 +00:00
TreeHugger Robot
fbe124ac1d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-19 16:30:13 +00:00
Bill Yi
86fcddb29b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a52c07fe48323256cc95a05226098db1e6ae2fa
 2020-12-19 06:15:53 +00:00
Tim Peng
65ba41c909 [automerger skipped] Add the explicitly mutable flag for creating a PendingIntent am: fbd36bc62b am: d9312ce40c -s ours 
am skip reason: Change-Id Ic37b37bdbe6de6bdbad741985d3a920334240d80 with SHA-1 40d4e47b05 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25d23369d8b4700b5329aa62f2b88f4393723434
 2020-12-18 15:14:14 +00:00
Tim Peng
d9312ce40c Add the explicitly mutable flag for creating a PendingIntent am: fbd36bc62b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13185577

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I378d49a95c30cdc330f0f05e89921a968cc86302
 2020-12-18 14:56:50 +00:00
Jeremy Goldman
471659f30d ModuleLicenseProviderTest converted to JUnit 
The superclass ContentProvider's "getContext" method is final and
cannot be mocked, so a helper method visible for testing was added
to allow for context injection.

Bug: 175389659
Test: atest -c ModuleLicenseProviderTest
Change-Id: I9e20171340ae0a48d74fae44c7b356ea67dba43b
 2020-12-18 12:06:16 +00:00
Jason Chang
3abd4c2ff8 Merge "Fix swipe for notification default should be on instead of off" 2020-12-18 09:29:06 +00:00
Tim Peng
fbd36bc62b Add the explicitly mutable flag for creating a PendingIntent 
Bug: 174047735
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: Id4a3c67025a06b63628298f4af28fbf5db45a566
 2020-12-18 07:38:18 +00:00
TreeHugger Robot
65f8f1eb35 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-18 06:14:25 +00:00
Bill Yi
bb96edf359 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic74400c2f6e03cabfa3a8f6843942140a799b773
 2020-12-17 12:12:20 -08:00
Jiashen Wang
5e9380f512 Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev am: 60de630fee am: ac636e9678 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4b7d4f3c411a05b1d2279928e7831c7c420e37b
 2020-12-17 18:52:41 +00:00
Jiashen Wang
ac636e9678 Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev am: 60de630fee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13226296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa4ad8d86ec4abe910b5eff52e406df0ec302766
 2020-12-17 18:19:16 +00:00
Christine Franks
007e0a8e69 Merge "Connect reduce bright colors settings" 2020-12-17 17:55:17 +00:00
Jiashen Wang
60de630fee Merge "Move eSIM reset before telephony manager reset in ResetNetworkConfirm" into rvc-qpr-dev 2020-12-17 17:44:31 +00:00
Bonian Chen
2d91a76166 [automerger skipped] Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e am: bb5688ea22 -s ours 
am skip reason: Change-Id Ie91eb82504fd7cff6671803a2bc2560139690952 with SHA-1 79b8ce0212 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98a258c9665bfdaf93965965e5b8bfa31f595415
 2020-12-17 16:10:56 +00:00
Bonian Chen
aa1ae299ef [automerger skipped] [Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81 am: 4ea9c2d6a5 -s ours 
am skip reason: Change-Id I0934a45a2917ab106627c733162efbee9a13f216 with SHA-1 a6b249d625 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I864660478553d38ac06c301708362db0ae9e8f04
 2020-12-17 16:10:55 +00:00
TreeHugger Robot
9bac9aa6f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bd246b61d2 -s ours am: b9d36a61e9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf9f76af4265377b1887d57721a81f11b9031cc1
 2020-12-17 16:10:46 +00:00
TreeHugger Robot
9e32066426 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d006eb8d9d -s ours am: d93b288441 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c4c52b23d5409caadefab2011515c768e029294
 2020-12-17 16:10:10 +00:00
Bonian Chen
bb5688ea22 Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
 2020-12-17 15:52:05 +00:00
Bonian Chen
4ea9c2d6a5 [Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13209427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide453d4b8f1a2b40057804fa1bb47705c05dbf86
 2020-12-17 15:52:03 +00:00
TreeHugger Robot
b9d36a61e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bd246b61d2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6707ebc2929d9f865e365e0658282782f1dec98
 2020-12-17 15:51:35 +00:00
TreeHugger Robot
d93b288441 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d006eb8d9d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92c208031dd426533e2193e52cfc1ee7dd1a8733
 2020-12-17 15:50:45 +00:00
Bonian Chen
0968b8603e Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev 
* changes:
  [Settings] code refactor - rename isSubscriptionCanBeDisplayed
  [Settings] Only display 1 SIM UI when multiple with same group UUID
 2020-12-17 15:27:46 +00:00
TreeHugger Robot
bd246b61d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-17 15:12:31 +00:00
TreeHugger Robot
d006eb8d9d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-17 14:58:08 +00:00
John Li
5d5f57dc15 Merge "Haptic effect on swiping the notification item" 2020-12-17 13:33:45 +00:00
Jeremy Goldman
bcca2b19dd Merge "Owners updates" am: 59465ee9d3 am: 2b1b458f1a am: e6765a0dc8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3aef110b7826093819576162c37974426afdb8a9
 2020-12-17 13:28:41 +00:00
Jeremy Goldman
e6765a0dc8 Merge "Owners updates" am: 59465ee9d3 am: 2b1b458f1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I308590ad0678932d17660264de8f7a81918bd371
 2020-12-17 13:16:21 +00:00
Jeremy Goldman
2b1b458f1a Merge "Owners updates" am: 59465ee9d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de2ba79486a4ec7df4962ca22ea21162c9f7ba3
 2020-12-17 12:59:18 +00:00
Jeremy Goldman
59465ee9d3 Merge "Owners updates" 2020-12-17 12:24:01 +00:00
Christine Franks
94f3cb0f2d Connect reduce bright colors settings 
Connection through new CDS APIs to come once that CL is merged.

Bug: 168065315
Test: atest SettingsUnitTests:com.android.settings.accessibility.ReduceBrightColorsIntensityPreferenceControllerTest

Change-Id: I9cc6a20ea5ea8a11c5fb3ef8a36e372d9c12b4bc
 2020-12-17 01:06:36 -08:00