Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,770 Commits 1 Branch 0 Tags
784b1cbf35879cfaea3e11d06995e90d84aa37c5
Commit Graph

27770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
784b1cbf35 Import translations. DO NOT MERGE am: 972c78b4ee -s ours 
am: e87f2bbaa0  -s ours

Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e
 2016-10-06 20:41:23 +00:00
Lei Yu
d7f2c10f94 Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev 
am: 9c54a67d66

Change-Id: Iba9f294bbbd1fd32e55950a6ddcc73604e4d0bea
 2016-10-06 20:41:04 +00:00
jackqdyulei
00ed827516 Add "FILTER_NOT_HIDE" for all app filters. 
am: d785a8db78

Change-Id: I779bc9de3e094c80c1749ac65acb932dc251f451
 2016-10-06 20:28:52 +00:00
Bill Yi
f0be222981 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: f91ca6bcd9  -s ours

Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10
 2016-10-06 20:28:13 +00:00
Bill Yi
47f6271d15 Import translations. DO NOT MERGE 
am: 8aee525418  -s ours

Change-Id: If58e31763e5f3b014126005d2816532323aa13f3
 2016-10-06 20:28:12 +00:00
Lorenzo Colitti
bb529c267d Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev 
am: 365d95b69a

Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a
 2016-10-06 20:27:51 +00:00
Lorenzo Colitti
be3924c1b6 resolve merge conflicts of f2801e4 to nyc-mr1-dev 
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
 2016-10-06 20:27:49 +00:00
Matthew Fritze
9264154bee Prevent monkey tests from crashing with race conditions 
am: 7ac78f2daf

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
 2016-10-06 20:27:36 +00:00
Bill Yi
ffae7d82c3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 0d424ef9bd  -s ours

Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9
 2016-10-06 20:27:09 +00:00
Bill Yi
b1f3f659f1 Import translations. DO NOT MERGE 
am: ae33f8e62c  -s ours

Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122
 2016-10-06 20:27:08 +00:00
Philip P. Moltmann
ae23c07073 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev 
am: f9ca06b367

Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
 2016-10-06 20:26:50 +00:00
Philip P. Moltmann
a78fced068 USB restriction is similar to media restriction 
am: 13ee50be48

Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
 2016-10-06 19:55:42 +00:00
Bill Yi
e87f2bbaa0 Import translations. DO NOT MERGE 
am: 972c78b4ee  -s ours

Change-Id: I526a783783c7ecda889b918ecfbafca399371895
 2016-10-04 20:05:52 +00:00
Lei Yu
9c54a67d66 Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev 2016-10-04 19:51:26 +00:00
Bill Yi
f91ca6bcd9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-04 18:51:05 +00:00
Bill Yi
972c78b4ee Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 31827713
Change-Id: Ib9bed5a9d8a9237935842d496c8f1630dad64c27
 2016-10-04 11:18:12 -07:00
Bill Yi
8aee525418 Import translations. DO NOT MERGE 
Change-Id: Iab5c7c6153bc12f50cc443225c0e562a795a7731
Auto-generated-cl: translation import
 2016-10-03 22:27:10 -07:00
Lorenzo Colitti
365d95b69a Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev 2016-10-03 23:37:10 +00:00
jackqdyulei
d785a8db78 Add "FILTER_NOT_HIDE" for all app filters. 
The "FILTER_NOT_HIDE" is used to filter out apps that "blacklisted"
by the carrier. So when user insert a specific sim card, these apps
are hiden in settings > apps unless user enable them.

Bug: 31823872
Test: Manual
Change-Id: I28a38b5780cb63fe22af12d80cc24e965b2b83cf
 2016-10-03 15:14:12 -07:00
Matthew Fritze
7ac78f2daf Prevent monkey tests from crashing with race conditions 
Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes: 31856366
Test: None, monkey test race conditions.
 2016-10-03 13:53:51 -07:00
Lorenzo Colitti
b01c080b08 resolve merge conflicts of f2801e4 to nyc-mr1-dev 
Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248
 2016-10-04 02:28:58 +09:00
Hugo Benichi
f2801e46d1 Update text of wifi to cell autoswitch toggle 
Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
 2016-10-04 00:56:53 +09:00
TreeHugger Robot
0d424ef9bd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-01 08:55:31 +00:00
Bill Yi
ae33f8e62c Import translations. DO NOT MERGE 
Change-Id: I50d10792c922453215b9af11d6867626c2ce2152
Auto-generated-cl: translation import
 2016-09-30 18:11:46 -07:00
Philip P. Moltmann
f9ca06b367 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev 2016-10-01 00:16:12 +00:00
Matthew Fritze
c94ac39096 Merge "Prevent double tap on suggestions" into nyc-mr1-dev 
am: d8435d57d2

Change-Id: Ia59ca2de3d5f90bb80c62ad3615197ccefc6f461
 2016-09-30 22:41:33 +00:00
Matthew Fritze
ae3ad11e69 Prevent double tap on suggestions 
am: 703dc60b14

Change-Id: I29e1f6aff53fc0c97ea5fabf325838981f1ef57f
 2016-09-30 22:41:32 +00:00
Matthew Fritze
4de4d8801d Tablet Settings support tab has start/end padding 
am: 839be498b6

Change-Id: I6e58352f95e5f5947a3d4ae111f3cf4a709462b7
 2016-09-30 22:38:23 +00:00
TreeHugger Robot
d8435d57d2 Merge "Prevent double tap on suggestions" into nyc-mr1-dev 2016-09-30 22:33:46 +00:00
Philip P. Moltmann
13ee50be48 USB restriction is similar to media restriction 
Bug: 31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
(cherry picked from commit 58e2b50292)
 2016-09-30 21:18:14 +00:00
Matthew Fritze
839be498b6 Tablet Settings support tab has start/end padding 
Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes: 31583422
Tests: Visual Inspection
 2016-09-30 21:16:30 +00:00
Matthew Fritze
703dc60b14 Prevent double tap on suggestions 
Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366
 2016-09-30 14:13:53 -07:00
Matthew Fritze
b0722aeb88 Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev 
am: cf0f301250

Change-Id: I3279202d4e7d9e836ca5173c9f4169c92c052d15
 2016-09-30 00:20:29 +00:00
Matthew Fritze
bbe0e8a30b Support dialog disclaimer text now appears properly 
am: adc5555acf

Change-Id: I8eefba43b0e919f502c91f5f770d446c1d17a4e3
 2016-09-30 00:20:27 +00:00
Matthew Fritze
cf0f301250 Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev 2016-09-30 00:12:55 +00:00
Garfield Tan
1ab4f4b816 Launch other info in storage in correct user id. 
am: 493bf348b9

Change-Id: Iced863d798194b66b549e4213b5f813c2773ac1b
 2016-09-29 23:23:50 +00:00
Matthew Fritze
adc5555acf Support dialog disclaimer text now appears properly 
The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.

Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f
 2016-09-29 22:32:10 +00:00
Garfield Tan
493bf348b9 Launch other info in storage in correct user id. 
Bug: 31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee
 2016-09-29 14:45:50 -07:00
Bill Yi
a69e26abbf Import translations. DO NOT MERGE am: dccfc04a3e -s ours 
am: ae35fa061e  -s ours

Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff
 2016-09-29 07:57:16 +00:00
Bill Yi
ae35fa061e Import translations. DO NOT MERGE 
am: dccfc04a3e  -s ours

Change-Id: Ia00dff846fc9174b6f5f4284e3d42f1ad9869ec7
 2016-09-29 07:53:15 +00:00
Bill Yi
c53fb015d9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: f497c48345  -s ours

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc
 2016-09-29 07:48:48 +00:00
Bill Yi
ae3ec3984d Import translations. DO NOT MERGE 
am: 4ae03656ac  -s ours

Change-Id: I69bfb0033fd813af6242dead9e30d4a1bfcd3cd6
 2016-09-29 07:48:46 +00:00
TreeHugger Robot
f497c48345 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:40:48 +00:00
Bill Yi
dccfc04a3e Import translations. DO NOT MERGE 
Change-Id: I0cd1cb776f4dda8b02f683d92cda3efedff989bb
Auto-generated-cl: translation import
 2016-09-28 23:25:18 -07:00
Bill Yi
4ae03656ac Import translations. DO NOT MERGE 
Change-Id: I4a6114d77d04143e22aa02f591cc6f7b75444d46
Auto-generated-cl: translation import
 2016-09-28 23:20:25 -07:00
Hugo Benichi
9bd60dd8ac Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev 
am: c81e1141cc

Change-Id: Idf215a22923b96129462579816e170655f99d4e8
 2016-09-29 03:46:11 +00:00
Hugo Benichi
b00a9135ba Update text of wifi to cell autoswitch toggle 
am: 1968fb1fd4

Change-Id: I58f87f2befc0dbcb1fa0ea43dc9255a7849984f6
 2016-09-29 03:46:10 +00:00
TreeHugger Robot
c81e1141cc Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev 2016-09-29 03:38:46 +00:00
Hugo Benichi
1968fb1fd4 Update text of wifi to cell autoswitch toggle 
Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
 2016-09-29 11:13:32 +09:00
Matthew Fritze
493350dcf7 Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev 
am: 6cafff3b2c

Change-Id: I8cc65986d6b5788ccbc8919e0788cf2db4b7fade
 2016-09-29 00:27:18 +00:00