Commit Graph

5628 Commits

Author SHA1 Message Date
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
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
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
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
Mehdi Alizadeh
5d77656d5d Merge "Increase char limit to 60 for string translation" into qt-dev
am: 178d4a7f8f

Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
2019-05-30 15:14:15 -07:00
TreeHugger Robot
178d4a7f8f Merge "Increase char limit to 60 for string translation" into qt-dev 2019-05-30 22:04:47 +00:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
b747c5c270 Merge "Add SIM color picker" into qt-dev 2019-05-30 20:01:48 +00:00
Mehdi Alizadeh
be98ea25ca Increase char limit to 60 for string translation
Bug: 133862422
Test: None
Change-Id: I3fa6705a6657c5aa65e496cba2ce470fb558a45f
2019-05-29 20:22:09 -07:00
Christine Franks
8869db9555 Add SIM color picker
Bug: 133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48

Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
2019-05-29 17:03:31 -07:00
Evan Laird
03acd2962e Merge "Change title to "Alerting"" into qt-dev
am: c64d41fd98

Change-Id: I2305841504e8146481bfd6128d1194d1741e1ba2
2019-05-29 12:40:16 -07:00
TreeHugger Robot
c64d41fd98 Merge "Change title to "Alerting"" into qt-dev 2019-05-29 19:19:59 +00:00
Julia Reynolds
75d207c364 Merge "Add snooze notification setting" into qt-dev
am: b8f7db90ce

Change-Id: If4f5777f87dda64edd2b947fe08be88fdae0c4db
2019-05-29 10:24:19 -07:00
Evan Laird
b18ec1958a Change title to "Alerting"
Test: visual
Fixes: 133825282
Change-Id: I08c58328eafdc37ba993d5189c8830e2c00115e6
2019-05-29 13:19:37 -04:00
Mill Chen
7d5050f252 Merge "Add EID as a synonym to SIM status" into qt-dev
am: 994d7d63d3

Change-Id: If6eefc766dd97858b424ffcd2387106dbd270de9
2019-05-29 10:04:24 -07:00
TreeHugger Robot
b8f7db90ce Merge "Add snooze notification setting" into qt-dev 2019-05-29 17:03:32 +00:00
TreeHugger Robot
994d7d63d3 Merge "Add EID as a synonym to SIM status" into qt-dev 2019-05-29 16:48:23 +00:00
Tsung-Mao Fang
8456765698 Revert "Tweak title for "App content""
am: 685d247730

Change-Id: I17befd995e227e53ecf7870dcc5af2e261039454
2019-05-29 09:45:30 -07:00
Tsung-Mao Fang
685d247730 Revert "Tweak title for "App content""
This reverts commit a00e725b0a.

Reason for revert: The string change only for Google Settings instead of
AOSP.

Test: visual
Bug: 133370964

Change-Id: Ib21bff1abc2fd169f957f10154914f85c71d22d1
2019-05-29 17:19:36 +08:00
Mill Chen
a5bbb26dfe Add EID as a synonym to SIM status
We can't use EID as keyword to search for it because EID info is located
in the SIM status dialog in which it's not searchable. EID is added as a
synonym of SIM status to support its search result.

Fixes: 133801685
Test: Settings > Search settings > type "eid"
      then will show "SIM status" search result
Change-Id: I03b49bf6f2951c468440f635d7b211266bb00d83
2019-05-29 07:36:38 +00:00
tmfang
21d1cab50d Merge "Tweak title for "App content"" into qt-dev
am: e40b0f7b8a

Change-Id: Ifa324de0e653e978743433da44657a5b5e30fd1e
2019-05-28 13:48:28 -07:00
TreeHugger Robot
e40b0f7b8a Merge "Tweak title for "App content"" into qt-dev 2019-05-28 20:31:51 +00:00
Mehdi Alizadeh
5409188e03 Merge "Adds string resources for gesture not supported dialog" into qt-dev
am: 7009b21d74

Change-Id: I4737dfb0132d52780c327b0c8b9fd48f6009b392
2019-05-28 11:33:52 -07:00
Mehdi Alizadeh
7009b21d74 Merge "Adds string resources for gesture not supported dialog" into qt-dev 2019-05-28 18:16:27 +00:00
Julia Reynolds
2e8c971a93 Merge "Move priorization setting to dev options" into qt-dev
am: 64f229d32b

Change-Id: Ic03000ed13a7c9c02b8660684929689b5b61df49
2019-05-28 10:10:42 -07:00
Julia Reynolds
ada3676b2d Move priorization setting to dev options
Under the other notif channel setting

Test: atest
Fixes: 133747537
Change-Id: I22fcf348b2070758a752babe64fe2af60fbe95a4
2019-05-28 15:33:22 +00:00
Julia Reynolds
3562c97441 Add snooze notification setting
Test: atest
Bug: 133494458
Change-Id: I3c0534860aaeb374384c4e30764313b1cb83c82a
2019-05-28 10:40:53 -04:00
Alan Stokes
121eaa7d3e Cleanup background activity starts for release.
This removes the parts of the feature that were only needed in beta
releases:
- Develper setting to force feature on or off.

Not to be submitted until after beta 5 is cut.

Bug: 131747138
Test: Still builds, developer settings still works.

Change-Id: I573761174317797aeb4df97cf1a2b1ce005c0715
2019-05-28 09:31:12 +01:00
Mehdi Alizadeh
195b5903db Adds string resources for gesture not supported dialog
Bug: 129532605
Test: Manual test to verity the strings are shown correctly
Change-Id: Ibc451170e936e7b8e1bf1c0be07be33e2ddca6a4
2019-05-24 18:38:01 -07:00
Evan Laird
a433064df4 Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I9346139116adef62b83e1e85030c8371fa936375
2019-05-24 10:13:47 -07:00
TreeHugger Robot
4321e038ff Merge "Simplify channel importance settings screen" into qt-dev 2019-05-24 16:36:49 +00:00
tmfang
a00e725b0a Tweak title for "App content"
Test: visual
Bug: 133370964
Change-Id: I6351df67164b35dc1299aa5a57ab10325af575de
2019-05-25 00:24:02 +08:00
Evan Laird
472e19eae4 Simplify channel importance settings screen
Back to bell icons, and removed the flavor text

Test: visual
Bug: 132971502
Change-Id: I55ce6dd07404aed2ceb5423796b733a70c3bfa13
2019-05-24 09:08:14 -04:00
Steve Elliott
61d2a1ae90 Merge "Remove info footer in global actions panel settings" into qt-dev
am: b731f4d5b9

Change-Id: Id4f69f671aaff77325d1ad2e9fd915388f9a9fe0
2019-05-23 08:38:00 -07:00
Steve Elliott
b731f4d5b9 Merge "Remove info footer in global actions panel settings" into qt-dev 2019-05-23 15:25:40 +00:00
Julia Reynolds
b30eb884ad Merge "Config notifs page updates" into qt-dev
am: 1c83c08289

Change-Id: I2115f438c9e496118fa3dfc91d98a709a266042d
2019-05-22 14:35:46 -07:00
Steve Elliott
2c293a2455 Remove info footer in global actions panel settings
Bug: 133332405
Test: manual
Change-Id: I8b7eed5ce3b4b585b0940888ef7c7413617e90dd
2019-05-22 15:38:00 -04:00
Julia Reynolds
4fe79c266e Config notifs page updates
- Remove unused settings
- Regroup and combine lockscreen settings. The original
lockscreen controller is used in other places (SUW and privacy)
and so it's left untouched for those uses for now.

Test: atest
Bug: 132971502
Change-Id: Ic82817ff98cab27ca35b9488ae2e0eb6922a18e8
2019-05-22 12:00:49 -04:00
Badhri Jagan Sridharan
f4cc1b5e79 Merge "Help URI for USB contaminant dialog" into qt-dev
am: 83c4ce4a48

Change-Id: I4e504e303edb8fab9c48aed458886dce709b0eab
2019-05-21 09:48:53 -07:00
Badhri Jagan Sridharan
83c4ce4a48 Merge "Help URI for USB contaminant dialog" into qt-dev 2019-05-21 00:31:45 +00:00
Kevin Chang
f8baacfe7f Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev
am: f508ece42d

Change-Id: I1c01a995f3cacdd80f5f97bce342dd0ce0907fe2
2019-05-18 01:24:02 -07:00
Kevin Chang
f508ece42d Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev 2019-05-18 08:09:43 +00:00
Fan Zhang
909b2192cb Merge changes I06c1bc14,I5415b8ed into qt-dev
am: a83638788b

Change-Id: Ied606e581e3c63e9f6fa4f455959caf4b2870edf
2019-05-17 16:43:01 -07:00
TreeHugger Robot
a83638788b Merge changes I06c1bc14,I5415b8ed into qt-dev
* changes:
  Clean up a STOPSHIP string
  Fix view overlap in wifi dpp enrollment.
2019-05-17 22:41:26 +00:00
Fan Zhang
1f8cc8f96d Clean up a STOPSHIP string
Bug: 110557011
Test: rebuild
Change-Id: I06c1bc1460cbb47feb6152298151477549a9e411
2019-05-17 13:44:01 -07:00
Kevin Chang
d8927cbabf Revert "Change string of switchbar and installed service category title"
This reverts commit 7eddb0e4dc.

Reason for revert: There's some side effects with string.
Create a new CL in master branch to fix it.

Bug: 132840332
Change-Id: I17526a06474d25bdb32beda96f5bb6371f0e5ade
2019-05-17 08:38:54 +00:00
Badhri Jagan Sridharan
bf5686e5f5 Help URI for USB contaminant dialog
Bug: 132737150
Test: build test.
Change-Id: If6ac3b086edaee18cd982ef12220b480d12f5228
2019-05-16 18:08:37 -07:00
Leon Liao
e51e69284c Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev
am: 764b8491e1

Change-Id: I8074cfd21490785952d180819c34dd383dff6ed3
2019-05-16 06:11:43 -07:00
Leon Liao
764b8491e1 Merge "Modify Accessibility Setting UI for timeout feature" into qt-dev 2019-05-16 13:02:56 +00:00