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

78850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
dbfd4e959a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c1be5d54b -s ours am: 94db77cc3a -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8652a9eac3dda8bb225baf47ad76f50d7bd56e25
 2020-12-22 19:42:09 +00:00
Stephane Lee
8fee0917f8 Add adaptive charging to the top level settings menu 
Bug: 172009945
Test: Trigger adaptive charging and verify string in menu
Change-Id: I8f600287c38e3992bb884faeb4df3d91570851a0
 2020-12-22 11:19:57 -08:00
Bill Yi
94db77cc3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c1be5d54b -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d03bf1c97923feb3f150dbfdcdd92d36f61ece3
 2020-12-22 19:09:02 +00:00
Bill Yi
10e7b48ad2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib84f2c025996d3ca8b6838b53549bac8cc22c2c7
 2020-12-22 10:23:36 -08:00
Bill Yi
0c1be5d54b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I85cdb72acedfc12b1536df9210643999e043a096
 2020-12-22 08:48:39 -08:00
SongFerngWang
a97b4faa67 The helper for slice of carrier and non-Carrier, used by ProviderModelSlice. 
create a helper file.
create a res/drawable/ic_signal_strength_zero_bar_no_internet.xml
create string at res/values/strings.xml

Bug: 173971144
Test: atest ProviderModelSliceHelperTest
Change-Id: I7f63a6b04784325989e776cb140017314ebde4ce
 2020-12-22 21:50:40 +08:00
TreeHugger Robot
f63874f2b0 Merge "Update String" 2020-12-22 07:29:24 +00:00
Allen Su
fc41649147 Merge "Change carrier config" am: ba38382627 am: 3d9ede1815 am: 034b2236dd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88fcda205e510641bc718d25b7f580e1c2d18648
 2020-12-22 07:16:06 +00:00
tim peng
271384174f Merge "Remove panel_slice_slider_row_large_icon.xml" 2020-12-22 06:32:48 +00:00
Hugh Chen
3354e9dc12 Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
 2020-12-22 14:26:44 +08:00
timhypeng
e11b1e6ede Remove panel_slice_slider_row_large_icon.xml 
-unused resource

Bug: 175850711
Test: build pass
Change-Id: Ibf344d2c1e54f4aaaa945afbca46e278089e9e01
 2020-12-22 04:41:44 +00:00
Jeremy Goldman
619a157b1d Merge "Log added once Network Factory Reset is complete" 2020-12-22 03:12:18 +00:00
Allen Su
034b2236dd Merge "Change carrier config" am: ba38382627 am: 3d9ede1815 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I521b6e79f50ac9b7a6b5ecb72a6e4d8ad0a580dc
 2020-12-22 01:35:07 +00:00
Allen Su
3d9ede1815 Merge "Change carrier config" am: ba38382627 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ffdb49ee1dde44fd272632086c75963dffaed27
 2020-12-22 01:04:35 +00:00
Jeremy Goldman
398a500ea7 Log added once Network Factory Reset is complete 
Test: N/A log message
Change-Id: I1372b2b535c50a79a1253555975d85cd2ca2be31
 2020-12-22 00:40:01 +00:00
Jeremy Goldman
6625f03eca DeviceNamePreferenceControllerTest converted to JUnit 
Rather than mocking the PreferenceScreen's getPreference function,
a PreferenceManager has been created, which instantiates the Screen.
The desired Preference is added to the Screen with the testing key.
Rather than using a shadow XML, contexts' resources are mocked.
A mock WifiManager is used instead of a shadow
Duplicate test case removed, and test which succeeds locally but
not on cuttlefish marked as ignored for now.


Bug: 175389659
Test: atest -c DeviceNamePreferenceControllerTest
Change-Id: I643b22993a1d102614fed1883af7f4925947be20
 2020-12-22 00:38:33 +00:00
Allen Su
ba38382627 Merge "Change carrier config" 2020-12-22 00:26:52 +00:00
Jeremy Goldman
04eeb1e5e3 Merge "ModuleLicenseProviderTest converted to JUnit" 2020-12-21 07:38:51 +00:00
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