Commit Graph

6476 Commits

Author SHA1 Message Date
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
Amin Shaikh
82b99415d3 Merge "Remove theming developer settings." into qt-r1-dev am: aa3ae7291a
am: 44d3605deb

Change-Id: I277873dd13eac2c2181399657527c625a81bf112
2019-05-28 16:29:09 -07:00
Amin Shaikh
44d3605deb Merge "Remove theming developer settings." into qt-r1-dev
am: aa3ae7291a

Change-Id: I71a45b7789a064d52c46c93439dda6057e5affc1
2019-05-28 16:24:07 -07:00
TreeHugger Robot
aa3ae7291a Merge "Remove theming developer settings." into qt-r1-dev 2019-05-28 23:20:22 +00:00
tmfang
75bf4c3661 Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a am: 21d1cab50d
am: b91b94bfb5

Change-Id: I326ff96634c1838d4919c7347a00e6147c8a530c
2019-05-28 13:58:49 -07:00
tmfang
b91b94bfb5 Merge "Tweak title for "App content"" into qt-dev am: e40b0f7b8a
am: 21d1cab50d

Change-Id: I1a5a64b25cb7cc0bfe5e43dfc92602043308490b
2019-05-28 13:54:17 -07:00
tmfang
f3327de8af Merge "Tweak title for "App content"" into qt-dev
am: e40b0f7b8a

Change-Id: Ic5b178957533091e409fbd1bf84807ab7cac3193
2019-05-28 13:48:29 -07: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
923ab1eacd Merge "Adds string resources for gesture not supported dialog" into qt-dev am: 7009b21d74 am: 5409188e03
am: b907a39a36

Change-Id: Ic090c4360f5b43cee34ebabe45f402bc42f39a12
2019-05-28 11:54:33 -07:00
Mehdi Alizadeh
b907a39a36 Merge "Adds string resources for gesture not supported dialog" into qt-dev am: 7009b21d74
am: 5409188e03

Change-Id: I4ae4dc61c8f9972da74729b82b866857610a8b63
2019-05-28 11:44:27 -07:00
Mehdi Alizadeh
facec6bc87 Merge "Adds string resources for gesture not supported dialog" into qt-dev
am: 7009b21d74

Change-Id: If52a8ca219c7dcdfb89405910b86f7b1c8ee2e54
2019-05-28 11:33:58 -07: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
18154c5922 Merge "Move priorization setting to dev options" into qt-dev am: 64f229d32b am: 67471c290a
am: af9e7c5e46

Change-Id: Ibe9a5e7367046d630d82790f6484122914fc3c2e
2019-05-28 10:29:46 -07:00
Julia Reynolds
af9e7c5e46 Merge "Move priorization setting to dev options" into qt-dev am: 64f229d32b
am: 67471c290a

Change-Id: Ie052457ab0ec1245b03c1283a7cd68ab18d18349
2019-05-28 10:14:43 -07: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
67471c290a Merge "Move priorization setting to dev options" into qt-dev
am: 64f229d32b

Change-Id: I17f48bbdea860e1b8e4b333f2370d446e906eaa9
2019-05-28 10:08:48 -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
Evan Laird
623cc03e11 Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff am: a433064df4
am: 22a6050035

Change-Id: I774539d62c337b7ec76ea74136c91f6da03124d6
2019-05-24 19:02:25 -07: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
Steve Elliott
a818dd47ca Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9 am: fba21ebbd2
am: f3a074d3b4

Change-Id: I523c8051375fcbaaf545e51f0feeab8548c83e62
2019-05-24 16:37:15 -07:00
Evan Laird
22a6050035 Merge "Simplify channel importance settings screen" into qt-dev am: 4321e038ff
am: a433064df4

Change-Id: I547d4346aea58b8a2fa1e9a3470ac4877f73ed68
2019-05-24 11:23:24 -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
Evan Laird
1e3eb21b0d Merge "Simplify channel importance settings screen" into qt-dev
am: 4321e038ff

Change-Id: I016269c4608af821497f262223cd7f0f62f8c5f5
2019-05-24 10:11:04 -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
Julia Reynolds
642f5aeee8 Merge "Config notifs page updates" into qt-dev am: 1c83c08289 am: 4679c46a8a
am: 7528ab396e

Change-Id: Iecf21ae784fcf82b31a7ccbf4fe52e8950709996
2019-05-24 06:38:22 -07: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
f3a074d3b4 Merge "Remove info footer in global actions panel settings" into qt-dev am: b731f4d5b9
am: fba21ebbd2

Change-Id: I2706d002c8af41c411643fe851ef844c5f9d935a
2019-05-23 08:52:45 -07:00
Steve Elliott
fba21ebbd2 Merge "Remove info footer in global actions panel settings" into qt-dev
am: b731f4d5b9

Change-Id: I7890695180fb191d58e5754e5baab032c82964b0
2019-05-23 08:39:46 -07: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
Amin Shaikh
083478ff01 Remove theming developer settings.
Fixes: 133222035
Test: mp settingsg; open developer options
Change-Id: Ide1573466dfab4bc116e14df1b23d129a4c5a176
2019-05-23 08:54:02 -04:00
Julia Reynolds
7528ab396e Merge "Config notifs page updates" into qt-dev am: 1c83c08289
am: 4679c46a8a

Change-Id: Iad70e94b3fa7bc65826c755ece8772b6a4c7e0d2
2019-05-22 15:13:32 -07: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
4679c46a8a Merge "Config notifs page updates" into qt-dev
am: 1c83c08289

Change-Id: I81339b13cb9cb222e324be4ff55214fc07966376
2019-05-22 11:05:38 -07: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
0f058e362e Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48 am: 50ad7da280
am: b6962d022d

Change-Id: Id91d6e2692122f2773f4fb7cc55d3f0ddecea698
2019-05-21 12:43:41 -07:00
Kevin Chyn
b907ffa7ed Merge "Update strings" into qt-r1-dev am: 9f17f84a10
am: b03f2e5183

Change-Id: Id131b1518ded7aa652c749f3094d4ddab629dec4
2019-05-21 11:19:00 -07:00
Badhri Jagan Sridharan
b6962d022d Merge "Help URI for USB contaminant dialog" into qt-dev am: 83c4ce4a48
am: 50ad7da280

Change-Id: Iff3652636ed7d61ceacec63d7261cf90bacaf8e6
2019-05-21 10:21:19 -07: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
Kevin Chyn
b03f2e5183 Merge "Update strings" into qt-r1-dev
am: 9f17f84a10

Change-Id: I5f063a2fd4f069f616da022f65e5bac416296b55
2019-05-21 09:35:46 -07:00
timhypeng
c82962b432 Update string
- merge title into body text

Bug: 131914743
Test: make -j50 RunSettingsRoboTests
Change-Id: I5298dbcc28f8ecb97f714c948cda12e040bfd391
2019-05-21 07:10:19 +00:00
Badhri Jagan Sridharan
50ad7da280 Merge "Help URI for USB contaminant dialog" into qt-dev
am: 83c4ce4a48

Change-Id: I57fd9c464ccf72f0002c58466b58f5c3884980eb
2019-05-20 19:51:58 -07:00