PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,144 Commits 1 Branch 0 Tags
1d45573eb24f305598120effa5b71ef0cffdbcec
Commit Graph

56144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
97bb8e9d34 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 am: 6089a14883 
Change-Id: If93befb35d7f8a6828568c977a75532332a71c93
 2020-03-12 11:31:37 +00:00
Automerger Merge Worker
a99bfeadf9 Merge "[Settings] Code refactor" am: a7a9863a52 
Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
 2020-03-12 11:19:13 +00:00
Automerger Merge Worker
6089a14883 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" am: 39d12019e4 
Change-Id: I66b1015bc59b4a123364bf013627facfce8c5905
 2020-03-12 11:19:06 +00:00
Bonian Chen
a7a9863a52 Merge "[Settings] Code refactor" 2020-03-12 11:08:01 +00:00
Bonian Chen
39d12019e4 Merge "[Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION" 2020-03-12 11:06:51 +00:00
Automerger Merge Worker
45bfbc1ea1 Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 
Change-Id: I3d17f1c7d3c63dc5fd3ba67fd7ca30e68f302fb4
 2020-03-12 10:49:29 +00:00
Automerger Merge Worker
5bbfb75207 DO NOT MERGE am: 37295f86bf 
Change-Id: I036454e184e0a1d4fe26240c3a1ec25d4fd55061
 2020-03-12 10:49:26 +00:00
TreeHugger Robot
8697de6be3 Merge "DO NOT MERGE" into qt-qpr1-dev 2020-03-12 10:36:01 +00:00
Bonian Chen
bfc8714e1f [Settings] Code refactor 
Code refactor.

Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
 2020-03-12 16:31:06 +08:00
Bonian Chen
35904059d0 [Settings] Fix behavior of mobile data plan 
Fix UI issue.

Bug: 150352656
Test: make
Change-Id: If5c6fc3c07259c45eba4d0f1f76b7b6de20cc6f4
 2020-03-12 16:26:51 +08:00
Bonian Chen
a9d89cfd60 [Settings] Add flag Intent.FLAG_GRANT_READ_URI_PERMISSION 
Add flag for startActivity() with URI.

Bug: 150352656
Test: make
Change-Id: I7292f3802e22a73dc61cbbb5551c12ca05261629
 2020-03-12 16:14:00 +08:00
Automerger Merge Worker
8410f505cb [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours am: 5f2520f685 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: If61a0c9903c1478420fb890f95bcd18bb4ac8baa
 2020-03-12 02:20:09 +00:00
Automerger Merge Worker
5f2520f685 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours am: 10caf51f27 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I19964afedd126b92b35977cc0a97abe1b8fb9ffc
 2020-03-12 02:09:20 +00:00
Automerger Merge Worker
10caf51f27 [automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0 -s ours 
am skip reason: subject contains skip directive

Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
 2020-03-12 01:51:17 +00:00
TreeHugger Robot
f2754332a0 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev 2020-03-12 01:35:21 +00:00
Automerger Merge Worker
3f24bd913b [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours am: 18d9d24ee3 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I6fc9ada0bcd634423887709248c5e82f6085cc3f
 2020-03-11 20:40:30 +00:00
Automerger Merge Worker
18d9d24ee3 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours am: 31933bea45 -s ours 
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b07f is in history

Change-Id: I0f6d8eeec8469cfe05b36bfbf27687be2973108a
 2020-03-11 20:29:24 +00:00
Automerger Merge Worker
8585436d80 Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e 
Change-Id: I4c7365c93c6e5bf14517765a20b8d82021bf279f
 2020-03-11 20:18:00 +00:00
Automerger Merge Worker
31933bea45 [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours am: a3ddb0c4fb -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic0716de563c854768010f78b01ee4cbd546e99a0
 2020-03-11 20:17:25 +00:00
Automerger Merge Worker
61167e098e Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b 
Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964
 2020-03-11 20:07:54 +00:00
Automerger Merge Worker
7559de5565 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 am: fe302e4867 
Change-Id: I209b3e3d4c641a843148feebda09964e43627782
 2020-03-11 20:06:22 +00:00
Automerger Merge Worker
d404e471b2 RESTRICT AUTOMERGE am: 077dd9b07f am: 19ff9101ee 
Change-Id: Ie3573e3cd7ecc9ca5ab227cd1fc530c173194a85
 2020-03-11 20:06:20 +00:00
Automerger Merge Worker
fe302e4867 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2 
Change-Id: I0b9346370cf28648659d38a6a2bdeb0f893195f5
 2020-03-11 20:05:37 +00:00
Automerger Merge Worker
487e3be342 [automerger skipped] DO NOT MERGE - Track framework changes to crashApplication am: 36f182159f -s ours 
am skip reason: Change-Id Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc with SHA-1 4a89abe279 is in history

Change-Id: Ia0e18095d5d00afba090fe47917b9f193dcdfc66
 2020-03-11 20:05:36 +00:00
Automerger Merge Worker
19ff9101ee RESTRICT AUTOMERGE am: 077dd9b07f 
Change-Id: I73f9a68326f6e6c477fc43eeb84b3349f519b658
 2020-03-11 20:05:35 +00:00
Automerger Merge Worker
a3ddb0c4fb [automerger skipped] RESTRICT AUTOMERGE am: 101c9be6c1 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5ec3ba82e851a69ab1d7aff75603ad6a674661fd
 2020-03-11 20:05:00 +00:00
TreeHugger Robot
5e788604c2 Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev 2020-03-11 17:51:30 +00:00
Chen Chen
291ff22d7b Merge "MetricId: Avoid byte[] and string ambiguity" 2020-03-11 17:26:37 +00:00
Automerger Merge Worker
84da18bf54 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 
Change-Id: I6dd10164057b625f1378e2937c1f1319c8d18ced
 2020-03-11 13:29:27 +00:00
Automerger Merge Worker
ec71e52496 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 
Change-Id: I3f9d4e48bce108de162bb11daa91338951a71b46
 2020-03-11 13:09:00 +00:00
Zoey Chen
23c382aa45 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" 2020-03-11 12:54:05 +00:00
zoey chen
3bfbb818c7 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-11 11:10:39 +00:00
Automerger Merge Worker
2259d20def Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e 
Change-Id: I740e7ac7d0cd6a7484c71941496e394f808ab027
 2020-03-11 06:04:42 +00:00
Automerger Merge Worker
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
 2020-03-11 05:51:49 +00:00
Benedict Wong
1e2a91ba1a Address cleanup comments from aosp/1234607 
This change addresses minor cleanup comments from aosp/1234607, renaming
a method.

Bug: 148991741
Test: Compiles
Change-Id: I2f31f8045040e6065a89e842b034aea605a99bd4
 2020-03-11 05:46:27 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00
Daniel Bright
fa5ffc97e6 Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED 
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
 2020-03-10 21:12:25 -07:00
Automerger Merge Worker
4f02905051 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 
Change-Id: I11597c7d826e767269016d6c3bf1d8c84462b315
 2020-03-11 02:20:10 +00:00
Automerger Merge Worker
d0d3fd6457 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e 
Change-Id: I3a0714c6e42bf6dde1371f2c188b4fa3bc4aceba
 2020-03-11 02:01:13 +00:00
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +00:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication 
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
 2020-03-10 15:52:05 -07:00
Automerger Merge Worker
1dd17f9d7a Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc 
Change-Id: I652971bb416cf41fae485582b105f16e55ee5979
 2020-03-10 21:01:50 +00:00
Chen Chen
847b534fdf MetricId: Avoid byte[] and string ambiguity 
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: Iad90e67a2cdde86aabb95585975be56fc33361fe
 2020-03-10 12:49:56 -07:00
Automerger Merge Worker
c702fbbccc Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
 2020-03-10 17:47:07 +00:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
c0fefd15a8 Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d 
Change-Id: Iccca0aee080dff80a7fead4b09e9ab5c93a22181
 2020-03-10 17:20:17 +00:00
Automerger Merge Worker
66d4405d1d Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
 2020-03-10 16:59:32 +00:00
Daniel Bright
716c06f700 Merge "Secret code fix - uses public symbol for secret" 2020-03-10 16:31:01 +00:00
Kenny Guy
37295f86bf DO NOT MERGE 
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
 2020-03-10 16:10:29 +00:00
Daniel Bright
d3b1fa8081 Secret code fix - uses public symbol for secret 
There were two CLs that conflicted causing
the functionality to break again.  This CL switches
back to TestingSettingsBroadcastReceiver back to using
the secret code on TelephonyManager.

This is Ok because ag/10331474 moves AndroidManifest
to same flag.

Test: Brought up "Testing" activity using secret code
Test: Hit breakpoint in TestingSettingsBroadcastReceiver
      within if block.
Bug: 149524255
Merged-In: I681d88d7f2f0f923850d33219a1ee56eedf87cad
Change-Id: I681d88d7f2f0f923850d33219a1ee56eedf87cad
 2020-03-09 22:29:22 -07:00