PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,206 Commits 1 Branch 0 Tags
f67076dad5079436e76eb3345410a31641a69e7c
Commit Graph

53206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
80fea5de92 [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev 
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d
 2019-06-05 02:12:49 -07:00
Raff Tsai
c808f15cbe [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
 2019-06-05 02:12:01 -07:00
Raff Tsai
530fa8b25b [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 
am: bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
 2019-06-05 02:11:52 -07:00
Raff Tsai
59348982d3 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 
am: 6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
 2019-06-05 02:11:36 -07:00
TreeHugger Robot
09e255676b Merge changes from topic "security_fix_settings" into oc-dev 
* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
  Do not allow draw on top for App notification settings
 2019-06-05 09:02:31 +00:00
TreeHugger Robot
8c612b1334 Merge changes from topic "security_fix_settings" into oc-dev 
* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
  Do not allow draw on top for App notification settings
 2019-06-05 09:02:31 +00:00
android-build-team Robot
c3f856bb7c Snap for 5633838 from f8eb8c3c90 to qt-release 
Change-Id: I062b47c313da540d1352b82be1dd5c635fc25fe0
 2019-06-05 03:05:22 +00:00
Android Build Merger (Role)
65294e6ee5 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 
Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f
 2019-06-05 02:50:10 +00:00
Android Build Merger (Role)
0b52ca4693 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 
Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3
 2019-06-05 02:50:07 +00:00
Android Build Merger (Role)
ed126b5d96 [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e 
Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef
 2019-06-05 02:50:04 +00:00
Android Build Merger (Role)
6dbb3108a7 [automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 
Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458
 2019-06-05 02:48:34 +00:00
Android Build Merger (Role)
bfe5b37bc8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 
Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6
 2019-06-05 02:37:14 +00:00
Android Build Merger (Role)
ceb1ed0a09 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 
Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452
 2019-06-05 02:37:12 +00:00
Android Build Merger (Role)
188904e631 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d 
Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9
 2019-06-05 02:37:11 +00:00
Android Build Merger (Role)
8f70c24f2d [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
 2019-06-05 02:37:09 +00:00
Android Build Merger (Role)
e537ffece8 [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e 
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
 2019-06-05 02:37:07 +00:00
Michael Groover
2123e3543c Remove developer option to disable device ID access restrictions 
Bug: 123937881
Test: Manually verified developer option is no longer available.
Change-Id: I00e8db23d88a5c84e273dfa4b8f797fa2a995de0
 2019-06-04 18:30:21 -07:00
Bill Yi
e655774644 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 3d9c7cb356 -s ours
am skip reason: subject contains skip directive

Change-Id: I87aca396c35ec9f0db74cb9079997a3995efbab5
 2019-06-04 18:25:55 -07:00
Alexey Kuzmin
ef530610fa Move vibration preview invokation to the correct place 
am: f8eb8c3c90

Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
 2019-06-04 18:16:10 -07:00
TreeHugger Robot
3d9c7cb356 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 00:23:38 +00:00
Malcolm Chen
57badc2a82 Triggering notifications when dual CDMA SIM combinations are detected 
In Settings, catch the intent from Telephony about SIM combination
warning and show a notification about it.

Bug: 132631355
Test: manual - have two cdma capable subscriptions active, make sure
the notification is sent, and tapping on it leads to the helper page.

Change-Id: Ifd0e13781e4afc3bfd82415b3e51fd10176d9f9d
 2019-06-04 17:11:09 -07:00
Alexey Kuzmin
f8eb8c3c90 Move vibration preview invokation to the correct place 
Bug: 133711461
Bug: 130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting

Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
 2019-06-04 15:44:43 +00:00
Bill Yi
3c85d10ef2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815
 2019-06-04 08:36:03 -07:00
Alan Stokes
5b09f510e2 Merge "Cleanup background activity starts for release." into qt-dev 
am: c53f5ecb3d

Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
 2019-06-04 07:38:04 -07:00
Alan Stokes
c53f5ecb3d Merge "Cleanup background activity starts for release." into qt-dev 2019-06-04 14:26:29 +00:00
android-build-team Robot
d3c213d6f0 Snap for 5631427 from c9fbd2ee50 to qt-release 
Change-Id: I866c90f3f61168effc011f7b43403a2a6a1af144
 2019-06-04 03:05:30 +00:00
Kevin Chang
d2fa1e6baa Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev 
am: 68aa4e4919

Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
 2019-06-03 18:41:08 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference 
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
 2019-06-03 18:39:19 -07:00
Kevin Chang
68aa4e4919 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev 2019-06-04 01:29:21 +00:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference 
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
 2019-06-03 15:20:33 -07:00
Lei Yu
057dc8466a Merge "Use new API to build NetworkTemplate" into qt-dev 
am: c9fbd2ee50

Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
 2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50 Merge "Use new API to build NetworkTemplate" into qt-dev 2019-06-03 16:54:29 +00:00
Kevin Chang
ba2bdbc93a Update the string of both magnification settings and gesture navigation tutorial dialog 
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0

Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
 2019-06-03 21:55:42 +08:00
android-build-team Robot
12508aa776 Snap for 5626731 from 2407b65709 to qt-release 
Change-Id: I8f10ee0b0307882ca5c79dea97fecd736ebc43a3
 2019-06-01 23:12:09 +00:00
Bill Yi
59faf30c59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 2407b65709 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd7efb56a6182a5374a0ce6cf5ea5114d98532ac
 2019-06-01 11:36:05 -07:00
TreeHugger Robot
2407b65709 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-01 18:17:35 +00:00
Bill Yi
6f9e016e2d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
 2019-06-01 10:06:36 -07:00
Mehdi Alizadeh
9b378dd381 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev 
am: cad67cdc0a

Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
 2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
cad67cdc0a Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev 2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488 Disables the Gesture nav option if 3P launcher is default 
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.

Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest

Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
 2019-05-31 12:26:28 -07:00
Raff Tsai
50ec2c218e Do not allow draw on top for App notification settings 
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f)
 2019-05-31 17:51:00 +00:00
Raff Tsai
5d9328571e Do not allow draw on top for App notification settings 
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f)
 2019-05-31 17:50:17 +00:00
Julia Reynolds
c816aa26bd Merge "Update notification settings animation" into qt-dev 
am: 1746ccca94

Change-Id: If2fe2025fcdcecd6a432a76b4eac4545249b39dc
 2019-05-31 10:42:17 -07:00
Lei Yu
fad8cec592 Merge "Fix issues in battery usage accounting" into qt-dev 
am: 2148c1a207

Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
 2019-05-31 10:41:54 -07:00
Julia Reynolds
1746ccca94 Merge "Update notification settings animation" into qt-dev 2019-05-31 17:27:09 +00:00
Lei Yu
ded55a1401 Use new API to build NetworkTemplate 
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.

Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
 2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207 Merge "Fix issues in battery usage accounting" into qt-dev 2019-05-31 17:17:51 +00:00
Salvador Martinez
ab5e939b72 Merge "Change switch text color to black in dark mode" into qt-dev 
am: ccbdd834ff

Change-Id: I933e00d2d75fbfe1c1d370f61df5b004bb99ec91
 2019-05-31 09:16:12 -07:00
TreeHugger Robot
ccbdd834ff Merge "Change switch text color to black in dark mode" into qt-dev 2019-05-31 15:59:42 +00:00
Julia Reynolds
760f617502 Merge "Reorder notification settings" into qt-dev 
am: 1abcbaa093

Change-Id: I083414ad1486c393a89622a9d61f4dc8a9703e85
 2019-05-31 06:32:30 -07:00