PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,287 Commits 1 Branch 0 Tags
458b48c7a5fe40afe3fe19ab269eae5720cd2b51
Commit Graph

85287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
458b48c7a5 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5c60f775bd8f4e6a89a60b06a664c4486b6aefb
 2021-10-06 19:29:51 +00:00
Weng Su
4b87f2ed83 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: I8bf96476d9072c25f716088df8db59c359d739e9
 2021-10-06 19:29:51 +00:00
Weng Su
554350c44a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25c0615df0622219c93ca1120f17ceed4b3c854e
 2021-10-06 19:29:46 +00:00
Weng Su
71c18be850 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ifa6bfaa9ba103300ec2f44b898a98aa8616ba41f
 2021-10-06 19:29:45 +00:00
Weng Su
00e38c59cc [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie10ab43aaa4b32dd0ef30ec1bb2f7826e13ced7d
 2021-10-06 19:22:09 +00:00
Weng Su
107ebcdc9e [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: I891871e38efd6074d0a0006ccc53c23fdf60ab1c
 2021-10-06 19:22:07 +00:00
Weng Su
374ef0012a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ab1dd93cd1fcbf872606ebf61477675f9d53d42
 2021-10-06 19:20:31 +00:00
Weng Su
b885452051 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id84f09761990be63f9aee395c1e5d33bd55450d4
 2021-10-06 19:20:30 +00:00
Weng Su
aed1ab9e45 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I3ee28caa937081f910aeb361e3dac5a913de74c7
 2021-10-06 19:09:37 +00:00
Weng Su
f05b8fbb79 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I769f3d5a15c1ee8bf7d4497f46c41e22dc2cc9e1
 2021-10-06 19:09:36 +00:00
Weng Su
eb871f3164 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174

Change-Id: I31e0d830de9a64550de5150f344f4424cf73a06c
 2021-10-06 19:08:59 +00:00
Weng Su
5598ec1d23 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620

Change-Id: I2c0700185c68242c201cb52ea581221ce39ae52f
 2021-10-06 19:08:58 +00:00
Weng Su
1b0f409000 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: Iab725f5469eb82e7b61cf2570edc0d8e7df46ea8
 2021-10-06 19:08:57 +00:00
Weng Su
395ac6073c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ie68ac2947f392a8046c2f62d9c357c852493eb2b
 2021-10-06 19:08:50 +00:00
Weng Su
d5ff68889c [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I18755f444c82aa7f3241812a1f51e0e06c009c07
 2021-10-06 19:08:49 +00:00
Weng Su
ed4abe8483 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev 2021-10-06 18:47:52 +00:00
Weng Su
259742ebb2 Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev 
* changes:
  [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
  [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
 2021-10-06 18:47:52 +00:00
Weng Su
ca67955d7d [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" 
This reverts commit 71e728e934.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
 2021-10-05 12:04:33 +00:00
Weng Su
f733da4859 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" 
This reverts commit 199528d460.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
 2021-10-05 12:04:14 +00:00
Weng Su
e92d1d1a6b [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" 
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
 2021-10-05 12:03:07 +00:00
Weng Su
18043562c1 [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity" 
Revert submission 15207347-add_permission_wifidialog

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging

Bug: 185126813
Change-Id: Ifc3b53dc91fc8d5aa31c1a10d4eb033bbe54c47d
 2021-10-05 06:47:46 +00:00
Weng Su
1c93d29b73 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" 
This reverts commit fa1e3870d8.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I77a027075465b5685a857b4c8c68203ef812a172
 2021-10-05 03:25:13 +00:00
Weng Su
12dcd5034a [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging" 
Revert submission 15207347-add_permission_wifidialog

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging

Bug: 185126813
Change-Id: I41721dbb34612144d00dba7885944d834bf93c7d
 2021-10-05 03:24:34 +00:00
TreeHugger Robot
d84c315d38 Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
  Import translations. DO NOT MERGE ANYWHERE
 2021-10-02 06:32:12 +00:00
Bill Yi
58d731dd8e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie6c0c856bec1c105543c0009f3e95663a821326d
 2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
 2021-10-02 04:42:52 +00:00
Bill Yi
85acba44c7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4898438471b4b34cd86437ca822a9433471d18e7
 2021-10-02 04:28:03 +00:00
TreeHugger Robot
0063fd58c1 Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Ice80370ec530e25aff4c67d7d42ac61f221c09df
 2021-09-30 19:05:58 +00:00
TreeHugger Robot
a2e975064e Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev 2021-09-30 18:51:47 +00:00
Bill Yi
61ea6910e3 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:57 +00:00
Bill Yi
337aa028ef [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: I051189c06198c31f1ba36cb9dad14f0652ce1ae7
 2021-09-28 09:01:33 +00:00
Bill Yi
3769790fed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
 2021-09-28 09:01:22 +00:00
Bill Yi
2c348d5230 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2c9945f74f76929129318310a17f2d74b08d65f8
 2021-09-28 08:46:31 +00:00
Bill Yi
f291d21a60 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:33:16 +00:00
Bill Yi
f40f1d1d7d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib20ad6dd4ea8be51db239ee622066fe5038b596b
 2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
 2021-09-26 04:34:53 +00:00
Bill Yi
f1ef62bc4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5b5687272886ed70438839901265a2cc1f5ef14a
 2021-09-26 04:20:15 +00:00
Bill Yi
d40bcd0e00 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-24 18:45:12 +00:00
Bill Yi
d1c7967860 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5243ecbb2b03700df9add0c1f2b9c2eb687157da
 2021-09-24 17:25:31 +00:00
Bill Yi
e984af65ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ba298d6fb25a5aff884b70fede792fb61d320cd
 2021-09-24 17:25:22 +00:00
Bill Yi
d43653e80d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:13:34 +00:00
Bill Yi
d5d07973eb Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 17:13:34 +00:00
Bill Yi
e5819c510b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-24 17:11:02 +00:00
Bill Yi
ffa2c65c22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:10:56 +00:00
Bill Yi
7c5b96a608 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 17:10:56 +00:00
TreeHugger Robot
8b76cbe82c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I777bfa48ef29c89552597b788bbfcfbcd13c735f
 2021-09-24 17:00:45 +00:00
Bill Yi
395e5ecfe8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I974e8eba87d9ae2fa8b64416407f07823a026ea3
 2021-09-24 17:00:23 +00:00
TreeHugger Robot
85214e918e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86e538594b008a280a542665306978afaba1e771
 2021-09-24 16:45:20 +00:00
Bill Yi
78abb83343 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37b3fc803bb1b033f24467dc54f43a8d7e1f4cb1
 2021-09-24 16:44:26 +00:00
TreeHugger Robot
416206347b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-24 16:32:30 +00:00