PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,456 Commits 1 Branch 0 Tags
2e2ea3569fdca968f24667d45011b12bc30c6f2a
Commit Graph

67456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
2e2ea3569f [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours am: 37ee14a792 -s ours am: 071beb9544 -s ours am: 80dba5ad0a -s ours 
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: I5abf237d9273ea7eb8335c42644e3434503ae1d1
 2020-04-30 04:32:09 +00:00
Malcolm Chen
5eaa00d420 [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours am: 38687bab76 -s ours am: 67a9e9b3cf -s ours am: 96e54a97bd -s ours 
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I5169ba462cbe9e1a8dd179734bdd639751f9f621
 2020-04-30 04:32:07 +00:00
Treehugger Robot
80dba5ad0a [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours am: 37ee14a792 -s ours am: 071beb9544 -s ours 
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: Icf0c170bfdfd8827bdd95d80c1406c458aed2c26
 2020-04-30 04:17:23 +00:00
Malcolm Chen
96e54a97bd [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours am: 38687bab76 -s ours am: 67a9e9b3cf -s ours 
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I0977d33e29b1e9916c5c8d15464b0310c4581f80
 2020-04-30 04:17:20 +00:00
Treehugger Robot
071beb9544 [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours am: 37ee14a792 -s ours 
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: I51f80b9e2eb590cf9a5b7567980ae85a96a2d17b
 2020-04-30 03:54:31 +00:00
Malcolm Chen
67a9e9b3cf [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours am: 38687bab76 -s ours 
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I25a3a7d37dcd3d15ec53a287d01961ee78423268
 2020-04-30 03:54:29 +00:00
Treehugger Robot
37ee14a792 [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours 
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: I3e9b8218b9ad4fdeb4b7d91b66f66881344b5036
 2020-04-30 03:33:51 +00:00
Malcolm Chen
38687bab76 [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours 
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I2151c3c3abe64328ef6f69adade622fb7b9700b5
 2020-04-30 03:33:49 +00:00
Treehugger Robot
ebea74264a Merge changes I6194592d,I5a02f847 am: 44146c8e3b 
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
 2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6 Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f 
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
 2020-04-30 03:17:16 +00:00
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847 
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
 2020-04-30 02:56:34 +00:00
TreeHugger Robot
7c5d000245 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 4bcea44f9c am: 9926c76546 am: 56e5e5ab06 
Change-Id: I577340e8499a5ec0a25b7fee65fc4bcc5e171943
 2020-04-30 00:02:47 +00:00
TreeHugger Robot
56e5e5ab06 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 4bcea44f9c am: 9926c76546 
Change-Id: I04fcb53c64b0205fa5e2c9a08dacf3cf91297ae4
 2020-04-30 00:01:28 +00:00
TreeHugger Robot
cc7d926ac0 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 7a41660242 am: 4539d41abc am: 90e7005350 
Change-Id: I06fab561f8459f8651a4f3d05dadba7dd357d941
 2020-04-29 23:50:08 +00:00
TreeHugger Robot
4b2b93ed5d Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 7c24739c48 am: 43f77e46d3 
Change-Id: I6b787056c585403e9740defce01c35039424a32b
 2020-04-29 23:48:36 +00:00
TreeHugger Robot
9926c76546 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 4bcea44f9c 
Change-Id: I2060be60ad1ebb12497513cafe7788589a34d000
 2020-04-29 23:47:52 +00:00
Treehugger Robot
54e4624133 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984 am: 8d55c46017 am: bc5007dd72 
Change-Id: I2c2994e543a690ff7db70dd0250d49b76e1e1d51
 2020-04-29 23:47:16 +00:00
Bob Badour
f7dc3bf8ae Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab am: 7c198d980d am: f761f7f7b5 am: 6e707e0189 
Change-Id: I51492fa3b24094694a8b5e5b5ee6c651fbac5a15
 2020-04-29 23:47:08 +00:00
TreeHugger Robot
90e7005350 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 7a41660242 am: 4539d41abc 
Change-Id: I34a1f8cbefba2160f54a674a99b89a2486078946
 2020-04-29 23:43:19 +00:00
TreeHugger Robot
43f77e46d3 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 7c24739c48 
Change-Id: I66ca0f87fa6bb070c69d7ad04a0f750f7a041d7c
 2020-04-29 23:41:14 +00:00
TreeHugger Robot
4539d41abc Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 7a41660242 
Change-Id: I12983c2ed072beec2082bd671b35602663437e63
 2020-04-29 23:29:41 +00:00
TreeHugger Robot
4bcea44f9c Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 
Change-Id: I55105a7dfa82b656c8a361606bc345837885880b
 2020-04-29 23:29:33 +00:00
TreeHugger Robot
7c24739c48 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 
Change-Id: Ibfec3437d07726fda09d4cf4a8976356965930d3
 2020-04-29 23:29:05 +00:00
Treehugger Robot
bc5007dd72 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984 am: 8d55c46017 
Change-Id: Ib7d729d1b146d7acb392ebceeea520300cb0bc62
 2020-04-29 23:28:44 +00:00
Bob Badour
6e707e0189 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab am: 7c198d980d am: f761f7f7b5 
Change-Id: Ia9cd5a77240c9b09201143dcdf754b2085c990cc
 2020-04-29 23:28:02 +00:00
TreeHugger Robot
9e4e794f09 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 
Change-Id: Ib54bda42c21dca85c8b58374d03c19f2f9c3ce15
 2020-04-29 23:19:53 +00:00
TreeHugger Robot
7a41660242 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 
Change-Id: I6112f47da149986b167befee9198d9f62d0c974d
 2020-04-29 23:19:32 +00:00
Treehugger Robot
8d55c46017 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984 
Change-Id: I2f8c1e5b290340ae03addbf9eb46b8ac9011a79c
 2020-04-29 23:17:54 +00:00
Bob Badour
f761f7f7b5 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab am: 7c198d980d 
Change-Id: I76f3dae6858c484dee5ddb09a3956cdaac12f331
 2020-04-29 23:17:47 +00:00
TreeHugger Robot
7d1cfa4d84 Merge "Fix history task stack" into rvc-dev 2020-04-29 23:04:13 +00:00
Treehugger Robot
99c2ccf984 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 
Change-Id: I77a6c089aec6fe57f79ef7dc7f6630ee8fc68ae7
 2020-04-29 23:01:07 +00:00
Bob Badour
7c198d980d Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab 
Change-Id: I0f269573abc1d68816664f1ef020cb04dacfa69e
 2020-04-29 23:00:38 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
 2020-04-29 22:50:24 +00:00
Bob Badour
2cd2b9e4ab Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 
Change-Id: Ifabb259302be383fad6555849876a4d7e3a0a71a
 2020-04-29 22:50:17 +00:00
Treehugger Robot
87d1e30f17 Merge "Disable 'Mobile data' selection after removing SIM" 2020-04-29 22:34:39 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM 
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
 2020-04-29 22:34:29 +00:00
Bob Badour
2ab7555be5 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" 2020-04-29 22:32:10 +00:00
Bob Badour
edb5a95f5d Remove MODULE_LICENSE_APACHE2 from apps/Settings 
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I818112c2ff1f9c2fffeb92291b03c7753c0b083e
 2020-04-29 13:12:26 -07:00
TreeHugger Robot
54cc6dac89 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 9e400e14c3 am: 9b697898d6 am: 17887fea31 
Change-Id: I165c9ca884a8e12e005a6a72da0235e1f59f4a0d
 2020-04-29 19:37:07 +00:00
TreeHugger Robot
18fd515e15 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 7bb2488099 am: d7bea7e161 
Change-Id: I004ee9b3543c675e76fac067647cf1e6f2778972
 2020-04-29 19:35:47 +00:00
TreeHugger Robot
17887fea31 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 9e400e14c3 am: 9b697898d6 
Change-Id: I39b1efe058cb0b7dd28f6ba4dd56ec1e86144dd4
 2020-04-29 19:29:56 +00:00
TreeHugger Robot
968abefdbc Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12 am: c8b2d09997 
Change-Id: I77450b815c5f9c1c8f239ea685af1ccde6b1a831
 2020-04-29 19:29:47 +00:00
TreeHugger Robot
d7bea7e161 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 7bb2488099 
Change-Id: Icb25eb558ec6443c1e41906cb6eff5e490345c27
 2020-04-29 19:10:27 +00:00
TreeHugger Robot
c8b2d09997 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12 
Change-Id: I8633badcf8c7ca68b9d7a48eb2272ab3162f0d57
 2020-04-29 19:09:30 +00:00
TreeHugger Robot
9b697898d6 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 9e400e14c3 
Change-Id: I927d2a024ef5c09a5acc4064d7577c759d464ad0
 2020-04-29 19:09:29 +00:00
TreeHugger Robot
9e400e14c3 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 
Change-Id: If3c8e5947552fc3ec1455ef8215acf58a9ee31aa
 2020-04-29 18:55:09 +00:00
TreeHugger Robot
7bb2488099 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 
Change-Id: Ic026c305eabbd86dc780292d666d0aa47e0c8ca9
 2020-04-29 18:55:06 +00:00
TreeHugger Robot
e22a776b12 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 
Change-Id: I72bfce2fd18f59c010ccb89203a7a7b3feb73ca6
 2020-04-29 18:54:56 +00:00
TreeHugger Robot
4d6ad1dec9 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
 2020-04-29 18:40:34 +00:00
TreeHugger Robot
f57fcea662 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 
Change-Id: Id187f39dc00fc84479f43545b71f70a64fab03d2
 2020-04-29 18:40:08 +00:00