PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,063 Commits 1 Branch 0 Tags
2b98c25bcfbab30f39cfa1a8c768237ba1036b3d
Commit Graph

72063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugene Susla
d67e22c122 RESTRICT AUTOMERGE am: bfa7a75545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: Id7909dd47451e3fbd02b5ca3ce4643cdd1da6715
 2020-12-07 16:44:22 +00:00
Xin Li
07ccb42665 DO NOT MERGE - Merge RQ1A.201205.011 
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
 2020-12-07 00:39:43 -08:00
Wesley.CW Wang
974f359a26 Add Battery Defender feature to Settings am: 7ccb54feb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13108999

Change-Id: I3b172988dd71c520ac6e1d286ae055243cb723e0
 2020-12-07 08:29:16 +00:00
Wesley.CW Wang
7ccb54feb6 Add Battery Defender feature to Settings 
- Adding new tips of Battery Defender, will be presented once battery is overheated
 - Launch Help Center article of battery overheat when clicking Battery Defender tip
 Screenshots: https://screenshot.googleplex.com/7jUibTJANgR6UQ6.png
 	      https://screenshot.googleplex.com/tUj2LLi87SfndBN.png

Bug: 172794045
Bug: 173497281
Bug: 173496188
Test: make RunSettingsRoboTests -j40
Merged-In: Ibb106a5d42cdf6232abf9ddf4b3225bdcebccf4a
Change-Id: Id400cec248a87dd27194d93bdf035e43bbcb7f4f
 2020-12-07 08:06:22 +00:00
TreeHugger Robot
cbbc224e4d Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev am: 9ccf19cb9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109545

Change-Id: I5f2c4d8549c28d1c91d81b7808183b0c97700dda
 2020-12-07 06:47:40 +00:00
TreeHugger Robot
9ccf19cb9f Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev 2020-12-07 06:29:43 +00:00
Hugh Chen
d1da284831 Fix output switcher will show 2 media sessions in some use cases 
Before this CL, we didn't check whether the remote session existed
in the list before. If the priority of a remote session is higher than
a local session, it causes us to return the local session even if
the list has a remote session.

This CL uses a list to cache package names of remote sessions.
If the local session has the same package name of the remote session
then don't return the local session.

Bug: 169052790
Test: make -j42 RunSettingsRoboTests
Change-Id: I2726a3deb397f646e4c74a8c445dde6fafb694a8
Merged-In: I2726a3deb397f646e4c74a8c445dde6fafb694a8
(cherry picked from commit 3a7293cbbf)
 2020-12-07 06:28:52 +00:00
Xiao Ma
ea12357dfa Update the Warning text about the visibility of device name. 
After enabling DHCP hostname option, the device name will be carried
in the DHCP packets when connecting to a Wi-Fi network, which is also
visible for the DHCP server (upstream AP or hotspot). Update the warning
text correspondingly.

Bug: 174644890
Test: m
Test: manual test to verify the warning text has been updated when
      changing the device name.(Settings > About Phone > Device name).
Change-Id: I031a03deb8d20fb3b3a217b0fa7d45aa1b3330d1
 2020-12-07 04:54:37 +00:00
Xin Li
c19e729570 DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 835215964f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13176357

Change-Id: I64db73472e9ad6b504a65033d2850cb0863af448
 2020-12-07 04:01:20 +00:00
TreeHugger Robot
436633ab5d Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev am: d7cf95ef74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13109544

Change-Id: I5ca519b1a3475afb9697bc76b20f550997afda2b
 2020-12-07 03:29:14 +00:00
TreeHugger Robot
d7cf95ef74 Merge "Fix output switcher will show 2 media session when remote playing" into rvc-qpr-dev 2020-12-07 03:07:25 +00:00
Xin Li
835215964f DO NOT MERGE - Mark RQ1A.201004.001 as merged 
Bug: 172690556
Change-Id: I32dff08f7cea0c4e645c653d1b63945b775b1078
 2020-12-06 14:43:21 -08:00
Treehugger Robot
209710e0ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f -s ours am: 11b0105b98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib768abcf5080d9973e38b1b21c3c881e1c8b4d88
 2020-12-06 17:06:48 +00:00
TreeHugger Robot
9f9300d38b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e5350c9e20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I635569dfc187ffd874bd4c9189039608ba762b08
 2020-12-06 17:06:17 +00:00
Treehugger Robot
11b0105b98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc
 2020-12-06 16:38:51 +00:00
TreeHugger Robot
e5350c9e20 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 16:22:59 +00:00
Treehugger Robot
b07d67eeaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours am: 7c2ed6be16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I719c254b4796c4dd1d53dc30e0f53d63b3e75fce
 2020-12-06 16:06:01 +00:00
Treehugger Robot
4d181cc04f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:05:53 +00:00
Treehugger Robot
7c2ed6be16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
 2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
 2020-12-06 12:37:23 +00:00
Bill Yi
b9a5248b95 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I518f13a32c239dfc98b053ad002d31577cd41a9a
 2020-12-06 12:10:17 +00:00
Bill Yi
a815a12c40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
 2020-12-05 16:49:34 -08:00
TreeHugger Robot
8e913664b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2a91ce9acfc651d32f9a3ca46f52612a8904eb7
 2020-12-05 01:55:42 +00:00
TreeHugger Robot
448ec6b5fe Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-05 01:04:28 +00:00
android-build-team Robot
702bfadcb0 Snap for 7012656 from 45a02ee994 to rvc-qpr2-release 
Change-Id: I5e8e8a85c4cd7920561121ed38f9177830c11351
 2020-12-05 00:12:56 +00:00
Bill Yi
d582948ff6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d890249a20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdf3ca3e032c9eba6d58bfca5409556ede8d15e7
 2020-12-05 00:10:24 +00:00
Bill Yi
d890249a20 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
 2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
 2020-12-04 03:09:46 -08:00
Wesley.CW Wang
15cad1e712 Update Settings Battery Defender strings am: 45a02ee994 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13146801

Change-Id: I9b6d03d465b981e13da2f056680d04f6f4f3ec6e
 2020-12-04 03:39:03 +00:00
android-build-team Robot
21db937f81 Snap for 7010201 from ec47b9a783 to rvc-qpr2-release 
Change-Id: Ia7fec78fd45f1c00d1ca9fdc2c8177ad012a1e4e
 2020-12-04 00:11:49 +00:00
Wesley.CW Wang
45a02ee994 Update Settings Battery Defender strings 
Bug: 172794045
Test: make SettingsRoboTests
Change-Id: Ia9612fe891431869dc8e84e78db952ac8f1ab3dc
 2020-12-03 19:00:44 +00:00
TreeHugger Robot
1710016924 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec47b9a783 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cb6d59d77c7d4671660f064f492f3337a176709
 2020-12-03 17:18:05 +00:00
TreeHugger Robot
ec47b9a783 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-03 16:51:46 +00:00
Bill Yi
4b1662623a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied07776386dcf321cb8405f5f972bc792b696da4
 2020-12-03 14:54:31 +00:00
Xin Li
b23c8335fb [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours 
am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477 is in history

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

Change-Id: I63b84242c8f858bb3abd3d04a64ccb3e3db8d3ac
 2020-12-03 04:25:17 +00:00
android-build-team Robot
794b345740 Snap for 7007636 from 084b1e0ece to rvc-qpr2-release 
Change-Id: Idaa05afeb249b20d17536fd92b47966f5dcdc6df
 2020-12-03 00:11:47 +00:00
TreeHugger Robot
473d899903 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 084b1e0ece -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe505474c923eb2a548f1516387ec3cde4cfb549
 2020-12-02 18:31:24 +00:00
Bill Yi
b6bb945dac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a86f4b1fc8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30ebedab39bbe054f5cfc1e5d2983079be268fe6
 2020-12-02 18:31:16 +00:00
TreeHugger Robot
084b1e0ece Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-02 17:33:31 +00:00
Bill Yi
def7fc914e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id901b94be193bb820bf90a645d7c716497af96dc
 2020-12-02 00:31:42 -08:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
 2020-12-02 00:29:15 -08:00
Bill Yi
a86f4b1fc8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I91b4abf5fc6aa17632203a700fbc0306a231bdf0
 2020-12-01 23:44:15 -08:00
Treehugger Robot
2112d09ac6 Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 am: 0cf0f58ceb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029

Change-Id: I9804a65d41dd36fea23925e62a8958d0808a87c6
 2020-12-01 02:57:03 +00:00
Treehugger Robot
0cf0f58ceb Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029

Change-Id: Ib92cfdb77164a7b24e65b2a028f963b606144096
 2020-12-01 02:41:37 +00:00
Treehugger Robot
4f8b47e5c2 Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." 2020-12-01 01:59:21 +00:00
Joseph Murphy
6d78a33475 Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class. 
Bug: b/174168302
Change-Id: I765e3f6c7f8ef2f2734862e75513e73353fea4c0
 2020-12-01 00:25:00 +00:00
android-build-team Robot
876884321b Snap for 7002428 from 9b7efe7e65 to rvc-qpr2-release 
Change-Id: I184a9ff58ee9e8f060a6cc02285f68075c417893
 2020-12-01 00:16:40 +00:00
timhypeng
b97ff55b3b Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority 
Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Merged-In: Idf6b07fb5918c487956fd1485d409c3161525f1b
Change-Id: Idf6b07fb5918c487956fd1485d409c3161525f1b
 2020-11-30 13:34:16 +00:00
timhypeng
7207584d6c Redirect to output switcher panel to the new dialog 
-Redirect for Cast button
-Send intent when call MediaOutputPanel::create()
-Return null to finish the activity

Bug: 172178632
Test: make -j50 RunSettingsRoboTests
Merged-In: I1038e237113f433c847aff98a45b1dd6089d80a8
Change-Id: I1038e237113f433c847aff98a45b1dd6089d80a8
 2020-11-30 13:34:07 +00:00