PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,498 Commits 1 Branch 0 Tags
1bb6c9bfd7213c27f46876b67d32a7d4fc04a5a4
Commit Graph

51498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
1bb6c9bfd7 Merge "Remove error slice from Settings in rendering time" into qt-dev am: e128d27a7a 
am: 22606bcfdd

Change-Id: I27a1209cd33aadb5b7e45b9e10645746a5f758f5
 2019-04-15 23:01:32 -07:00
Felipe Leme
8987213cfc Merge "Change Content Capture strings." into qt-dev am: d51e020cc6 
am: aba152b7ef

Change-Id: I88dc9a29f69ced429ff83396200e28c7c730fe4c
 2019-04-15 22:51:45 -07:00
Alex Salo
27fe74d87b Merge "Rename screen aware into screen attention" into qt-dev am: ad4483c2a2 
am: 6f0624a025

Change-Id: I7fb0b4d01eb2f5d67ee4eabd47fe31d6ac10bd13
 2019-04-15 22:38:40 -07:00
Edgar Wang
fd42fe1c8f Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev am: 83fcc3582e 
am: 515d30f819

Change-Id: I514f789d2f96cdbf8806df1d185cf2430b702aa3
 2019-04-15 22:37:48 -07:00
Pasty Chang
88569d3469 Merge "Set WifiDialog to light theme in setup flow" into qt-dev am: 997128ee91 
am: 686fe46e78

Change-Id: If4070e54092b8e122f937676af39d8dc4dcf4aa6
 2019-04-15 22:36:41 -07:00
Raff Tsai
22606bcfdd Merge "Remove error slice from Settings in rendering time" into qt-dev 
am: e128d27a7a

Change-Id: I41eb5123dec7ffd7b6b085b2d67ad89033cda742
 2019-04-15 22:26:48 -07:00
TreeHugger Robot
e128d27a7a Merge "Remove error slice from Settings in rendering time" into qt-dev 2019-04-16 05:20:58 +00:00
Felipe Leme
aba152b7ef Merge "Change Content Capture strings." into qt-dev 
am: d51e020cc6

Change-Id: I56610c79cc69f2064e231ffdbbe5d5fa50cc4ed8
 2019-04-15 22:08:33 -07:00
Fan Zhang
5a9173f5ca Merge "Clean up DND slice in search." into qt-dev am: 12ee53f122 
am: e2a3670672

Change-Id: I15691e0657ef0e7f54f7b3bce35aeff3dd8f4a9e
 2019-04-15 21:56:52 -07:00
Felipe Leme
d51e020cc6 Merge "Change Content Capture strings." into qt-dev 2019-04-16 04:51:24 +00:00
Colin Cross
0ff1b6cb01 Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp 
am: 2e7a226e65

Change-Id: I94a0ac1545fc0084e895567831ca52217fe53598
 2019-04-15 21:33:49 -07:00
Alex Salo
6f0624a025 Merge "Rename screen aware into screen attention" into qt-dev 
am: ad4483c2a2

Change-Id: I2f20adc1ecfec076a82c5d3f110986a9812ccc7d
 2019-04-15 20:56:13 -07:00
Edgar Wang
515d30f819 Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev 
am: 83fcc3582e

Change-Id: I1a1bb7aa2243b4440bd66b00484bcbddae23ade2
 2019-04-15 20:46:16 -07:00
Pasty Chang
686fe46e78 Merge "Set WifiDialog to light theme in setup flow" into qt-dev 
am: 997128ee91

Change-Id: Idef21e3f81305fc79de860836d617f041e6353e0
 2019-04-15 20:45:25 -07:00
Fan Zhang
e2a3670672 Merge "Clean up DND slice in search." into qt-dev 
am: 12ee53f122

Change-Id: Idfa60999ed1202bab9f6f9a737f461f0bbb2e39f
 2019-04-15 20:43:50 -07:00
Colin Cross
2e7a226e65 Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp 2019-04-16 03:35:51 +00:00
TreeHugger Robot
ad4483c2a2 Merge "Rename screen aware into screen attention" into qt-dev 2019-04-16 03:17:50 +00:00
TreeHugger Robot
83fcc3582e Merge ""Disallow adjust volume" restricted dialog didn't show" into qt-dev 2019-04-16 03:12:41 +00:00
Pasty Chang
997128ee91 Merge "Set WifiDialog to light theme in setup flow" into qt-dev 2019-04-16 02:53:29 +00:00
Fan Zhang
12ee53f122 Merge "Clean up DND slice in search." into qt-dev 2019-04-16 02:50:10 +00:00
Edgar Wang
73454f2607 "Disallow adjust volume" restricted dialog didn't show 
root casue: VolumeSeekBarPreference & SeekBarPreference will return
false when call isSelectable() then this preference won't perform Click

Fixes: 123745455
Test: Manual & robotest
Change-Id: Iba27b503e8a272260c80bd41aecdd5cdbc39f962
 2019-04-16 09:41:07 +08:00
Raff Tsai
000ba3fabe Remove error slice from Settings in rendering time 
We filter error slice in EligibleCardChecker but not filter it in
SliceContextualCardRenderer, these two part should use the same
logic.

Fixes:128687331
Test: manual
Change-Id: I217bc6b578ceb36b0a67b44dc8a08ecd02771d82
 2019-04-16 07:41:31 +08:00
Jordan Liu
e45f90db03 [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev am: 80584fe1f7 -s ours 
am: 5ccb19e418 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 e431f6337f is in history

Change-Id: Id556d7b4aec9cfe7578dec6884809429e05427f9
 2019-04-15 15:59:01 -07:00
Jordan Liu
5ccb19e418 [automerger skipped] Merge "Make RadioInfo settings menu work for mSIM" into qt-dev 
am: 80584fe1f7 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 e431f6337f is in history

Change-Id: I5101430419c3f026c00e52d09ae2b426febbd12d
 2019-04-15 15:35:37 -07:00
Jordan Liu
80584fe1f7 Merge "Make RadioInfo settings menu work for mSIM" into qt-dev 2019-04-15 21:55:43 +00:00
Jordan Liu
28d000b7b3 [automerger skipped] Merge "Do not reuse phonestatelistener" am: c99fddfe75 am: 1636344325 -s ours 
am: f47e4cc536 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 728e186441 is in history

Change-Id: I46fc1a05e88a56db019af9cb4eb9d31a5b054a80
 2019-04-15 13:16:17 -07:00
Felipe Leme
6beb5e4581 Change Content Capture strings. 
Test: manual verification
Bug: 129403630

Change-Id: Idfc560c78e29a0557cb009dddf98f4e1ce879f25
 2019-04-15 13:08:50 -07:00
Jordan Liu
f47e4cc536 [automerger skipped] Merge "Do not reuse phonestatelistener" am: c99fddfe75 
am: 1636344325 -s ours
am skip reason: change_id I9d6631da628351511e285afeb5b6d4331aaab7e5 with SHA1 85f1d2a704 is in history

Change-Id: I3879f0514ab892b4c2826eb880374f634ba80822
 2019-04-15 12:42:46 -07:00
Jordan Liu
1636344325 Merge "Do not reuse phonestatelistener" 
am: c99fddfe75

Change-Id: I52e311da7ae9a9477b74fc25f6bb122935e14582
 2019-04-15 12:37:48 -07:00
Jordan Liu
c99fddfe75 Merge "Do not reuse phonestatelistener" 2019-04-15 19:27:06 +00:00
Lei Yu
fe26fdfb80 Merge "Hide app usage time in high usage dialog" into qt-dev am: 9515a685e3 
am: c562fdcebf

Change-Id: I79c3b165eff60633668fe228ebdb7318fa0bd84f
 2019-04-15 11:24:41 -07:00
Lei Yu
c562fdcebf Merge "Hide app usage time in high usage dialog" into qt-dev 
am: 9515a685e3

Change-Id: Ibe5266fd010ab54350d679f0b1710b08ff05aa4a
 2019-04-15 11:12:22 -07:00
Lei Yu
9515a685e3 Merge "Hide app usage time in high usage dialog" into qt-dev 2019-04-15 17:54:39 +00:00
Alex Salo
c6cfd5e3bf Rename screen aware into screen attention 
Bug: 111939367
Test: make RunSettingsRoboTests, manual
Change-Id: I4f65bd11a71db6601cea418a5d89b14d91858ab4
 2019-04-15 17:11:35 +00:00
pastychang
1d2b51aeb0 Set WifiDialog to light theme in setup flow 
Screenshot: https://screenshot.googleplex.com/X6tkxihEWFY

Test: Manual
Bug: 130507879
Change-Id: Icca6b827cdb62387fde4c91435d4df10e2ff4d04
 2019-04-15 05:49:51 +00:00
Cosmo Hsieh
c7ae0a3d11 Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev am: 96b534951c 
am: bd8c87097d

Change-Id: I5a17e96800fee3f10b1b5a30a7ff3cd8131036af
 2019-04-13 23:01:55 -07:00
Cosmo Hsieh
bd8c87097d Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev 
am: 96b534951c

Change-Id: I5fd338e5bcabe349740e586406aac7ceba1f2102
 2019-04-13 22:56:56 -07:00
Cosmo Hsieh
96b534951c Merge "[PasspointV2] Clear feature flag settings_wifi_details_saved_screen" into qt-dev 2019-04-14 05:51:02 +00:00
Antony Sargent
3d42893600 Merge "Update intent in SimNotification" into qt-dev am: ead402c329 
am: 265971cc1e

Change-Id: I91c4566af7b6b3c7fe7163c09fb9faf6c529874c
 2019-04-13 22:26:53 -07:00
Antony Sargent
265971cc1e Merge "Update intent in SimNotification" into qt-dev 
am: ead402c329

Change-Id: I56ca38510190315b6cf74cd81d3b4f0321adb062
 2019-04-13 22:22:53 -07:00
TreeHugger Robot
ead402c329 Merge "Update intent in SimNotification" into qt-dev 2019-04-14 05:11:58 +00:00
Kevin Chyn
a9a2578768 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev am: 79f49b4626 
am: 9433c38eb6

Change-Id: Ib4e72b79dfd4b987067405bb1be2bf936a4d8fb1
 2019-04-13 21:16:31 -07:00
Kevin Chyn
9433c38eb6 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev 
am: 79f49b4626

Change-Id: I605486afb4126619bcdfa1261ad8a3bb33647235
 2019-04-13 21:11:32 -07:00
Pasty Chang
cb665368d4 Merge "Set suw description textview to fixed id" into qt-dev am: ee35c1bddf 
am: 247c77e6ec

Change-Id: Ia5dcbb06ff2cc409341d33b905d1ce73b0e5c541
 2019-04-13 21:11:31 -07:00
Pasty Chang
247c77e6ec Merge "Set suw description textview to fixed id" into qt-dev 
am: ee35c1bddf

Change-Id: I306cedd59e191de716616e1815c81230046b314b
 2019-04-13 21:06:37 -07:00
Kevin Chyn
79f49b4626 Merge "Launch correct enrollment activity from ChooseLock" into qt-dev 2019-04-14 04:03:54 +00:00
Pasty Chang
ee35c1bddf Merge "Set suw description textview to fixed id" into qt-dev 2019-04-14 03:53:16 +00:00
Bill Yi
8ef8c389f5 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: bea1ed8666 -s ours am: ad53ebb2da -s ours 
am: 3460820b57 -s ours
am skip reason: subject contains skip directive

Change-Id: I867f9551565141b88006ecadb17393f57f0b4e73
 2019-04-13 05:11:36 -07:00
Bill Yi
3460820b57 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: bea1ed8666 -s ours 
am: ad53ebb2da -s ours
am skip reason: subject contains skip directive

Change-Id: Iadd8fa72e16ff5385af2d419badc0825ee3d3d9e
 2019-04-13 05:06:34 -07:00
Bill Yi
ad53ebb2da [automerger skipped] Merge "Import translations. DO NOT MERGE" 
am: bea1ed8666 -s ours
am skip reason: subject contains skip directive

Change-Id: Iec39c3c20fdb63b908c40ca9273a17e1baef8612
 2019-04-13 04:57:24 -07:00