Commit Graph

27729 Commits

Author SHA1 Message Date
Rubin Xu
0948ce0cdb Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev 2016-08-23 13:07:02 +00:00
Rubin Xu
7a4ecbac12 Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev 2016-08-23 12:59:17 +00:00
Doris Ling
6cdd5fccd8 Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev 2016-08-23 01:51:21 +00:00
Doris Ling
e9af5024a1 Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev 2016-08-23 01:37:29 +00:00
Doris Ling
cf988e3d64 Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev 2016-08-23 01:30:27 +00:00
Doris Ling
15c13f9e10 Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev 2016-08-23 01:29:41 +00:00
TreeHugger Robot
88d3cb7176 Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev 2016-08-22 22:24:15 +00:00
Salvador Martinez
f4ccb09603 Merge "Tests for launch support on default feature" into nyc-mr1-dev
am: 5b5cf5a2c7

Change-Id: I7c855c5e352f57fb32a81baa891a83993fc926ca
2016-08-22 22:21:03 +00:00
Salvador Martinez
6c07416eba Tests for launch support on default feature
am: 3fb4e96b0d

Change-Id: I3b3e4c1e717861856a1c5daf9d9bc9047629dae1
2016-08-22 22:21:02 +00:00
Salvador Martinez
a9dc4d46ca Merge "can open settings with support tab by default" into nyc-mr1-dev
am: 5bd202e277

Change-Id: I0100549be28207d38ac040e8e7cd5fd5c3c1447f
2016-08-22 22:20:58 +00:00
Salvador Martinez
8d47bdc773 can open settings with support tab by default
am: 12c5208ad0

Change-Id: Ic28fc68db3d971ccf48c5667875474d4c9060a7b
2016-08-22 22:20:54 +00:00
Lei Yu
ffc6372e7d Merge "Make number in dialog highlighted" into nyc-mr1-dev
am: 2363094863

Change-Id: Ie93f7f491f2ccc5747963be5ba44e1e9c94fc584
2016-08-22 22:20:52 +00:00
jackqdyulei
226ccfe62f Make number in dialog highlighted
am: 7a78213776

Change-Id: I1b5fb80a2a38a1224d6aa586d1ff2065c4a2a32a
2016-08-22 22:20:52 +00:00
Lei Yu
69db34ed2e Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
am: dd90acf2c0

Change-Id: I61637865ac2eed318d46e568b61f8eecc03713ab
2016-08-22 22:20:51 +00:00
jackqdyulei
fbed8d95e9 Fix the nullpointer bug in monkey test.
am: 409c4708c1

Change-Id: I03e6e3a5951f587169d0b2758283bff069b925a2
2016-08-22 22:20:50 +00:00
Salvador Martinez
4c8776627b Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev 2016-08-22 21:56:21 +00:00
Salvador Martinez
4f6755931e Merge "Made dialog material design compliant" into nyc-mr1-dev 2016-08-22 21:56:06 +00:00
Salvador Martinez
0e98c73666 Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev 2016-08-22 21:55:47 +00:00
Salvador Martinez
89d138b724 Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev 2016-08-22 21:55:18 +00:00
Salvador Martinez
5b5cf5a2c7 Merge "Tests for launch support on default feature" into nyc-mr1-dev 2016-08-22 21:53:53 +00:00
Salvador Martinez
5bd202e277 Merge "can open settings with support tab by default" into nyc-mr1-dev 2016-08-22 21:53:53 +00:00
Salvador Martinez
3fb4e96b0d Tests for launch support on default feature
Includes some espresso tests to ensure that the proper
tab is selected when you attempt to launch settings.

Bug: 30233920
Change-Id: I171293114bd84b064b333091fcf2394d44debed5
(cherry picked from commit d1ef20beaa)
2016-08-22 21:52:46 +00:00
Lei Yu
2363094863 Merge "Make number in dialog highlighted" into nyc-mr1-dev 2016-08-22 21:50:29 +00:00
Lei Yu
dd90acf2c0 Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev 2016-08-22 21:49:56 +00:00
Fan Zhang
a5785b72bb Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
am: 45fd5c4d4e

Change-Id: I6ea35fe7eb8b6b8d711b128ada6da50284896a40
2016-08-22 21:37:49 +00:00
Fan Zhang
ede4f9d41f Set oem unlock switch to reflect the actual state of device
am: 1ba24ca792

Change-Id: I77c374d43d6f78cf57cf2a1a9bb505538d86c9aa
2016-08-22 21:37:48 +00:00
Bill Yi
0d15b016db Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b98e47c79b  -s ours

Change-Id: I5b2018c5885abc17a04d5e5a1bae92178cd9e854
2016-08-22 21:37:47 +00:00
Bill Yi
4114547feb Import translations. DO NOT MERGE
am: f58be49ba8  -s ours

Change-Id: Ia9c43520ca258a2b85c47c417016f689723935ee
2016-08-22 21:37:45 +00:00
Fan Zhang
93c6887768 Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
am: 5a6fad7607

Change-Id: I227c1571ba527529af038bf805c15f8b0bc803a4
2016-08-22 21:37:44 +00:00
Fan Zhang
2dd0275d66 Have a fallback package name when matching targetPackage.
am: 0c58131c37

Change-Id: I0c57b1a71c6388a3fdfc761b44b142abfdf40bcb
2016-08-22 21:37:43 +00:00
Fan Zhang
562d8276a6 Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
am: ce8a222a59

Change-Id: I2c8356156df5a938add968561efccdcc3affe72e
2016-08-22 21:37:42 +00:00
Fan Zhang
eebdb575ba Align text to view start so they layout correctly in RTL.
am: be56fc17ed

Change-Id: I079df4d68672d97b4bb30996fb58c5a951e513f1
2016-08-22 21:37:41 +00:00
TreeHugger Robot
45fd5c4d4e Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev 2016-08-22 21:32:44 +00:00
TreeHugger Robot
b98e47c79b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-22 21:28:29 +00:00
TreeHugger Robot
5a6fad7607 Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev 2016-08-22 21:23:48 +00:00
TreeHugger Robot
ce8a222a59 Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev 2016-08-22 21:17:20 +00:00
Fan Zhang
06b7346a8b Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev
am: 95c097e835

Change-Id: I0449a66cb1ae894c6fdb8e478325ba222f84ff8d
2016-08-22 20:17:01 +00:00
Fan Zhang
c8b20343f0 When click conditional's title, expand/collapse content.
am: 89d7bca166

Change-Id: I7ee56f661cba9e9d79399b8f01fc05cf5a70b27a
2016-08-22 20:16:59 +00:00
Fan Zhang
0ae351771e Hide default phone preference when there is no phone app.
am: dc1e04035b

Change-Id: I2b588c9a31f405f66c1603aacbe67798ac637dee
2016-08-22 20:05:30 +00:00
TreeHugger Robot
95c097e835 Merge "When click conditional's title, expand/collapse content." into nyc-mr1-dev 2016-08-22 20:01:17 +00:00
Bill Yi
f58be49ba8 Import translations. DO NOT MERGE
Change-Id: Ic0668c1bf03195d38aabb92176ae6ff6d6f079d2
Auto-generated-cl: translation import
2016-08-22 12:57:11 -07:00
Fan Zhang
1ba24ca792 Set oem unlock switch to reflect the actual state of device
Bug: 30772025
Change-Id: I143ceafb36f2f2091683b29d02ee64c07e44bb15
(cherry picked from commit e98178bd58)
2016-08-22 19:41:42 +00:00
Fan Zhang
be56fc17ed Align text to view start so they layout correctly in RTL.
Bug: 28011099
Change-Id: I65b7ab768c384a558f89e3bce539420454fed8a5
(cherry picked from commit 794de426da)
2016-08-22 19:40:22 +00:00
Fan Zhang
0c58131c37 Have a fallback package name when matching targetPackage.
Bug: 29774397

When figuring out best match package name, we should have a fallback.
Otherwise sometimes we get empty package names, causing problems when
trying to display memory usage for each app.

Change-Id: I9cc4205098bb7c727a3063b2275fb464c8153097
(cherry picked from commit d5ff4c4292)
2016-08-22 19:39:10 +00:00
Fan Zhang
89d7bca166 When click conditional's title, expand/collapse content.
Bug: 30200101

It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.

Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
(cherry picked from commit a2db2ca8fa)
2016-08-22 18:30:16 +00:00
Fan Zhang
dc1e04035b Hide default phone preference when there is no phone app.
Bug: 29859821
Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401
(cherry picked from commit bc6fc60683)
2016-08-22 18:17:22 +00:00
Meng Wang
715564af48 DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable am: 5ea4bb2f43 -s ours
am: a928b294d9  -s ours

Change-Id: If964580319c45956d10626b57a6e769665bb75dd
2016-08-22 04:59:13 +00:00
Meng Wang
a928b294d9 DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
am: 5ea4bb2f43  -s ours

Change-Id: Iba62c6b007ad0d68d528047896dfd88961a953cd
2016-08-22 04:46:46 +00:00
Meng Wang
5ea4bb2f43 DO NOT MERGE ANYWHERE: WiFiCallingSettings: hide wfc mode preference if not editable
Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
(cherry picked from commit 4436d6fe16)
2016-08-20 22:47:08 +00:00
Matthew Fritze
1051fe1e14 Stop apps with Storage Managers from launching activity when disabled
An app with a storage manager would be able to launch Manage Storage
from application settings, but when the app was disabled, the
activity would be null.

Test: In order to properly unit test this function, a large redesign is 
needed in this class, and is outside the scope of this bug.

Change-Id: Ia6b78bc6761bac8b701c904a6e438bbd951b63e8
Fixes: 30457616
(cherry picked from commit 8f17fcaa1d)
2016-08-20 00:34:31 +00:00