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

85588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Solomon
cdf1cf85ee Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324

Change-Id: I155b6358e1ebafe3128bbc8c52f71fe391236ce3
 2021-10-05 23:00:43 +00:00
Daniel Solomon
396939a577 Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev 2021-10-05 22:44:19 +00:00
Bill Yi
1f44763e81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00b1f3b12b11cabb628c10632fd6957ceedc410c
 2021-10-05 07:49:00 +00:00
Bill Yi
a516da5761 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0590d5697883acc61ef586054d1ceb0820162159
 2021-10-05 01:44:34 +00:00
TreeHugger Robot
ce03913deb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2dea37dac41c682b9ed26e4f91e40e55a49fba7f
 2021-10-02 06:43:06 +00:00
Bill Yi
c58566b623 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9681141c17e40d26b8125911133e413cf5c501f9
 2021-10-02 06:42:59 +00:00
Bill Yi
c9920edd8e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 7093e26067 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ad7194b9b6159e101b87dc3f8ddd4ad7f1ddf95
 2021-10-02 06:42:40 +00:00
TreeHugger Robot
da8e9c1108 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-02 06:34:33 +00:00
Bill Yi
41533a64d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
 2021-10-02 04:46:24 +00:00
Bill Yi
853fdb2f22 [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: If00f802350f9a2769fb8cc2d992c0f7b42f09f43
 2021-10-02 04:43:05 +00:00
Bill Yi
7093e26067 [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: I26116054259653dcc9f68186b1a4a6bf0a13c393
 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
TreeHugger Robot
6d4c35933c Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15952458

Change-Id: I5d3ee4751264b436a3e1bc9d9ff7f90037a92102
 2021-10-01 23:44:05 +00:00
TreeHugger Robot
468bad73d7 Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev 2021-10-01 23:26:52 +00:00
TreeHugger Robot
39fae9778c Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15843434

Change-Id: I0e708bc4dd419c72389dafb51dadb240fa8a79e7
 2021-10-01 18:17:16 +00:00
TreeHugger Robot
e750fb7528 Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev 2021-10-01 18:15:58 +00:00
Sunny Shao
f25e8aa74c Add more info on the dialog of AllowBindAppWidgetActivity 
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
Merged-In: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
(cherry picked from commit 1564ef5ca1)
 2021-10-01 05:45:49 +00:00
TreeHugger Robot
bed34d70fb Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: cddd334ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Ia0111381dc70bb1b4d73ff337fb2e303b52d8b48
 2021-09-30 19:23:22 +00:00
TreeHugger Robot
f00be6bdfc Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev am: a2e975064e am: 9a573b1942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15821792

Change-Id: Idd67e658def711bd9c63f24dfda05dedb989d795
 2021-09-30 19:22:59 +00:00
TreeHugger Robot
cddd334ee6 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: Ia84dd48edcae481fb006b582e9e5c2274d2e86e7
 2021-09-30 19:06:45 +00:00
TreeHugger Robot
9a573b1942 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: Id94319ec70f89a5f153d4e7f6db9ed2cba036997
 2021-09-30 19:05:51 +00:00
TreeHugger Robot
a2e975064e Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev 2021-09-30 18:51:47 +00:00
TreeHugger Robot
0db131b42b Merge "Fix USB tether option" into sc-qpr1-dev am: 7ba545d992 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15868748

Change-Id: I152a4223fbbf0ceaadfab992dc14bce46af763cd
 2021-09-30 12:21:45 +00:00
TreeHugger Robot
7ba545d992 Merge "Fix USB tether option" into sc-qpr1-dev 2021-09-30 12:06:41 +00:00
Bill Yi
81d0121ce0 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev am: bdbca48e77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: I6baee344ad8cd621010d02feab31f91b11435124
 2021-09-29 17:23:24 +00:00
Bill Yi
88bf3f3238 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: a27f0eaf3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia86c28d779abdb85b0a2aca6dcf07d94d1e0af82
 2021-09-29 17:23:21 +00:00
Bill Yi
e6c645a44d Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp am: 2c7cd22dee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15932729

Change-Id: Ia0d5acb5f9b1b1fc91ac927e1a33152d48b6cd48
 2021-09-29 17:23:15 +00:00
Bill Yi
8c9a83328b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed am: 43b9cb669c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79de19bc08d1dd408b8b7579a7aafa2cf557974d
 2021-09-29 17:23:14 +00:00
Bill Yi
2c7cd22dee Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp 
* 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
bdbca48e77 Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-qpr1-dev 
* 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
TreeHugger Robot
b05731a195 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 83423b2dff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icadf73353bcc7f27f511fadc794b943809b11fcf
 2021-09-29 08:16:19 +00:00
TreeHugger Robot
83423b2dff Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 08:04:35 +00:00
Xin Li
32f9c41a53 [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours am: dc818b7b1f -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I223a4cfd2637ea81a139c186a640b2078cb62fc0
 2021-09-29 05:52:02 +00:00
Xin Li
dc818b7b1f [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I8efcd178648ac15b8a32e75f7481c5943af94af4
 2021-09-29 05:38:41 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016 
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
 2021-09-28 19:39:58 +00:00
Xin Li
d62dc93bff DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 am: 7a7b87716f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I618b06ffd1b1e9029575a4f7d080dcb0c5329b60
 2021-09-28 15:01:42 +00:00
Xin Li
7a7b87716f DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I9ed0817f2ef9449e472476dfd5ed54b4e126bd5d
 2021-09-28 14:43:13 +00:00
Bill Yi
069684e925 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5025bf1696bea34629632b29351fc463f33ef27d
 2021-09-28 09:04:57 +00:00
Bill Yi
43b9cb669c [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: Iea597fedb4bf06eae6760f6d313bc8f7909f2077
 2021-09-28 09:01:34 +00:00
Bill Yi
a27f0eaf3d [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: I0ab870320ff4498bd159cef7c9659eef3ce00139
 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
Xin Li
c41a577e37 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
 2021-09-28 07:55:18 +00:00
YUKAI HUNG
5e32dec664 Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev am: 36072e86ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919139

Change-Id: I92e32ec565c45d58b28c1430693f5fba11780844
 2021-09-28 07:30:26 +00:00
YUKAI HUNG
4f513d7237 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev am: 4a4f13d5b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919140

Change-Id: Icdc5d87aa5f41ab32fc546d0bd513d505bcebd51
 2021-09-28 07:30:13 +00:00
YUKAI HUNG
36072e86ef Merge "[S-QPR1] protect gettinng battery stats from DeadSystemException" into sc-qpr1-dev 2021-09-28 07:19:59 +00:00
YUKAI HUNG
4a4f13d5b0 Merge "[S-QPR1] add package name for enable/disable app user actions metric" into sc-qpr1-dev 2021-09-28 07:12:01 +00:00
Bill Yi
397b66c992 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537

Change-Id: I038f654fef5583fcd295d5c9aa263a73b4bf1a40
 2021-09-27 14:50:31 +00:00
Bill Yi
58cf11a21a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: fe3544e435 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia888ce7e89c8e65e0915496c446d54e1ce07abc0
 2021-09-27 14:50:29 +00:00
Bill Yi
797ea65d28 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b am: 7245d9f02a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ba326f60d727b1941260042ef9c2dbe45bc3fe7
 2021-09-27 14:50:00 +00:00
Bill Yi
7378aac868 Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev 
* 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