Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,974 Commits 1 Branch 0 Tags
28dc57628b3f2e6deec496045cb2b87b83b2dd91
Commit Graph

28974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ajay Panicker
28dc57628b Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec am: 717d9f205a 
am: 0493302a06

Change-Id: Ib82a2ed83b783816ad2305d51f3ec823c6d83926
 2016-08-18 22:33:21 +00:00
Ajay Panicker
0493302a06 Merge "Do not allow apps to cause Bluetooth to be discoverable forever" am: 692ad7c9ec 
am: 717d9f205a

Change-Id: I1c4f627f6792109db1fec087855962bf4f635b7c
 2016-08-18 22:30:51 +00:00
Ajay Panicker
717d9f205a Merge "Do not allow apps to cause Bluetooth to be discoverable forever" 
am: 692ad7c9ec

Change-Id: I60f576fee6222d0917ce845dd0bc071817d26009
 2016-08-18 22:27:24 +00:00
Treehugger Robot
692ad7c9ec Merge "Do not allow apps to cause Bluetooth to be discoverable forever" 2016-08-18 22:23:05 +00:00
Meng Wang
7ed381b919 Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev am: f30ef19dc3 
am: 7f26e8407c

Change-Id: I04e9482f719bd0a0d66fffa918b5e0be7d1029d4
 2016-08-18 22:11:37 +00:00
Meng Wang
d2eed8a642 WiFiCallingSettings: hide wfc mode preference if not editable am: 4436d6fe16 
am: f1788b502e

Change-Id: I67bb75cf7b453d9ca7e5a6a47dc16fbf074fa747
 2016-08-18 22:11:37 +00:00
Meng Wang
7f26e8407c Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev 
am: f30ef19dc3

Change-Id: Ibe2e2a5a6d5188ae4aa42195884caa5b0ad7853b
 2016-08-18 22:08:27 +00:00
Meng Wang
f1788b502e WiFiCallingSettings: hide wfc mode preference if not editable 
am: 4436d6fe16

Change-Id: Ica966b8306afd541521b0e7f65c68019f4c692b4
 2016-08-18 22:08:27 +00:00
Ajay Panicker
c6f63a807f Do not allow apps to cause Bluetooth to be discoverable forever am: 6dcab67c0c 
am: 091986f33a

Change-Id: I2231d4bb2d339bbcf4a248e1702c3efae82c544d
 2016-08-18 22:01:26 +00:00
TreeHugger Robot
f30ef19dc3 Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev 2016-08-18 21:59:17 +00:00
Ajay Panicker
091986f33a Do not allow apps to cause Bluetooth to be discoverable forever 
am: 6dcab67c0c

Change-Id: Ifaef229a60b74bb2708159232fe8f6792ded7647
 2016-08-18 21:57:51 +00:00
Ajay Panicker
3c1149871d Do not allow apps to cause Bluetooth to be discoverable forever 
Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.

Bug: 28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77
(cherry picked from commit 6dcab67c0c)
 2016-08-18 13:28:27 -07:00
Ajay Panicker
6dcab67c0c Do not allow apps to cause Bluetooth to be discoverable forever 
Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.

Bug: 28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77
 2016-08-18 13:19:06 -07:00
Meng Wang
4436d6fe16 WiFiCallingSettings: hide wfc mode preference if not editable 
Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9
 2016-08-18 12:19:01 -07:00
Julia Reynolds
4b273f5985 Merge "Display days of week in locale order." into nyc-mr1-dev am: 8d9ade8b9c 
am: fcc323c091

Change-Id: I680adb75a621a0641a2262199a86ad7693ce9566
 2016-08-17 19:04:35 +00:00
Julia Reynolds
6a710906a7 Display days of week in locale order. am: 0bb60ada96 
am: c3997cbae1

Change-Id: Ic8837b2b5c1985910a02edf62316597bdff87122
 2016-08-17 19:04:35 +00:00
Fan Zhang
ddb3407dd5 Load default data warning value instead of hardcode it. am: 688ad857e8 
am: 2ef1750fff

Change-Id: I1b33b9e40e0daf6b489a0662f7b14631b6899d7b
 2016-08-17 18:31:20 +00:00
Bill Yi
617f47d77a Import translations. DO NOT MERGE am: 8a611b1162 -s ours 
am: 25a04c0b39  -s ours

Change-Id: I51f6a1fe06709f31cb51d99e5deeb7ebcb3b91cc
 2016-08-17 18:31:16 +00:00
Julia Reynolds
fcc323c091 Merge "Display days of week in locale order." into nyc-mr1-dev 
am: 8d9ade8b9c

Change-Id: I2fc4c10d0fae744749a7c92aa0c39681e1c9861c
 2016-08-17 18:11:44 +00:00
Julia Reynolds
c3997cbae1 Display days of week in locale order. 
am: 0bb60ada96

Change-Id: I9c6cb0b0947d8d313fa5794185fbe119cfa7725a
 2016-08-17 18:11:43 +00:00
Fan Zhang
2ef1750fff Load default data warning value instead of hardcode it. 
am: 688ad857e8

Change-Id: Ie982559572c96da6ba0bb9276f4ba974936b418f
 2016-08-17 17:39:24 +00:00
Bill Yi
25a04c0b39 Import translations. DO NOT MERGE 
am: 8a611b1162  -s ours

Change-Id: I69399deba5bc5fd85d06923cacc07fb1128f6eec
 2016-08-17 17:39:22 +00:00
Julia Reynolds
8d9ade8b9c Merge "Display days of week in locale order." into nyc-mr1-dev 2016-08-17 16:42:25 +00:00
Fan Zhang
688ad857e8 Load default data warning value instead of hardcode it. 
Bug: 30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92
 2016-08-16 14:14:21 -07:00
Bill Yi
8a611b1162 Import translations. DO NOT MERGE 
Change-Id: Ib98e5307dd77c0295e16e465c0f12d362749ea4b
Auto-generated-cl: translation import
 2016-08-16 02:31:55 -07:00
Fan Zhang
67a496221e Don't dial any number if DIAL intent is not supported. am: 6098913d4b 
am: 9d478bef16

Change-Id: I6726f4551a1ca865c225d2c6d2bfb0b1e6a4f00a
 2016-08-15 23:44:32 +00:00
Fan Zhang
9d478bef16 Don't dial any number if DIAL intent is not supported. 
am: 6098913d4b

Change-Id: Ia00c08773bb69508f274739043b6c0b00015358e
 2016-08-15 23:40:39 +00:00
Fan Zhang
6098913d4b Don't dial any number if DIAL intent is not supported. 
Bug: 30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209
 2016-08-15 13:24:18 -07:00
Adrian Roos
20fe8b32b8 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 404104a6a8 
am: c8131c1e58

Change-Id: I35103df353bf82d27dec8a579f459ec1201247cd
 2016-08-12 23:18:40 +00:00
Adrian Roos
523ec5476d Assist: Allow disabling the disclosure animation am: fff9fd87bf 
am: cea8891d5a

Change-Id: Ib18f9a866942cc40752b7ff36d2cd6a2aa6e7084
 2016-08-12 23:18:32 +00:00
Fan Zhang
80fb5552d0 Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53 
am: 91becf6d87

Change-Id: I44e1b5af1f4555d4f2483634e525582153c82968
 2016-08-12 20:40:43 +00:00
Fan Zhang
96f37df6d9 Strings in a diclaimer dialog when turning on NFC. am: 9c9cadd991 
am: d9f35ed984

Change-Id: Id5e8ed6bc0398d97e7ca662c1c9bf173a3159a7f
 2016-08-12 20:40:43 +00:00
Adrian Roos
c8131c1e58 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev 
am: 404104a6a8

Change-Id: I0254b84dac2b1cb3fa7a07e74218bf8cc30ff59b
 2016-08-12 20:35:34 +00:00
Adrian Roos
cea8891d5a Assist: Allow disabling the disclosure animation 
am: fff9fd87bf

Change-Id: I625b96295a9f39704f2016903f4cfc063613122f
 2016-08-12 20:35:30 +00:00
TreeHugger Robot
404104a6a8 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev 2016-08-12 20:28:11 +00:00
Fan Zhang
91becf6d87 Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev 
am: f22f7e8b53

Change-Id: I892a2e9b741b44b462bd30581ad0d7c36e1db514
 2016-08-12 20:21:31 +00:00
Fan Zhang
d9f35ed984 Strings in a diclaimer dialog when turning on NFC. 
am: 9c9cadd991

Change-Id: Ic71699bbc33fca59c29abd8c7e3804975ceca9db
 2016-08-12 20:21:30 +00:00
TreeHugger Robot
f22f7e8b53 Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev 2016-08-12 19:58:27 +00:00
Fan Zhang
9c9cadd991 Strings in a diclaimer dialog when turning on NFC. 
Bug: 30834503

Change-Id: If18fe3ae075d96fbac20751d91d10a03d3396a53
 2016-08-12 11:29:16 -07:00
Bill Yi
a614a9c4b7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e -s ours 
am: 7b1062da75  -s ours

Change-Id: I64e1747122165a22613ec976e8a3d9d713da41d6
 2016-08-12 09:45:35 +00:00
Bill Yi
1bf4d2d8f6 Import translations. DO NOT MERGE am: 125aecfb4b -s ours 
am: e24aef7907  -s ours

Change-Id: I0808abfa35007a9539f9f411ab5c64b6c9572863
 2016-08-12 09:45:33 +00:00
Bill Yi
7b1062da75 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 99b590df3e  -s ours

Change-Id: If09ddaa056c14936d86b11a369a7a2a31025f057
 2016-08-12 09:38:33 +00:00
Bill Yi
e24aef7907 Import translations. DO NOT MERGE 
am: 125aecfb4b  -s ours

Change-Id: Ic8503c8f4b0b05582c1ad5f12e0e5123b2ea5c41
 2016-08-12 09:38:33 +00:00
TreeHugger Robot
99b590df3e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-08-12 09:25:46 +00:00
Bill Yi
125aecfb4b Import translations. DO NOT MERGE 
Change-Id: I8eeb62c2d3038fb78118c0f2d08f94329f441be5
Auto-generated-cl: translation import
 2016-08-11 18:25:13 -07:00
Jeremy Klein
9de1885a4d Fix a broken TetherServiceTest. am: 8681148918 
am: be9c338253

Change-Id: Ic4b97f70f0ac75c3ee42ebc51a0b1365a7ac58f1
 2016-08-12 00:06:28 +00:00
Jeremy Klein
be9c338253 Fix a broken TetherServiceTest. 
am: 8681148918

Change-Id: Ie8a290129fd32b6630273a29cd6f77425e6c419d
 2016-08-12 00:02:57 +00:00
Jeremy Klein
8681148918 Fix a broken TetherServiceTest. 
This should have been updated when I changed settings to use the new
tethering API.

Bug: 30814807
Change-Id: I3853e6abf1e9976aedae70d4ff41336940545b64
 2016-08-11 15:57:29 -07:00
Adrian Roos
fff9fd87bf Assist: Allow disabling the disclosure animation 
Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes: 30809067
 2016-08-11 15:48:13 -07:00
Matthew Fritze
7e6a8e4cff Merge "Update support tab strings." into nyc-mr1-dev am: 623650c898 
am: 3f89379170

Change-Id: I5d3b012f334a12a5bf5566906d8100712aa34ff2
 2016-08-09 22:42:41 +00:00