Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,918 Commits 1 Branch 0 Tags
47eb9c90afdcdc1a09ddae23f3d075ba34da30bc
Commit Graph

25918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
47eb9c90af Revert "Import translations. DO NOT MERGE" am: 0bd0bb04b2 -s ours 
am: 4e4326fc14  -s ours

* commit '4e4326fc144171c907a054edb93d9369f23a9ba4':
  Revert "Import translations. DO NOT MERGE"
 2016-03-14 16:36:58 +00:00
Geoff Mendal
4e4326fc14 Revert "Import translations. DO NOT MERGE" 
am: 0bd0bb04b2  -s ours

* commit '0bd0bb04b2a39767d5a2dc1f6c4abfb53954cc5d':
  Revert "Import translations. DO NOT MERGE"
 2016-03-14 16:34:52 +00:00
Geoff Mendal
0bd0bb04b2 Revert "Import translations. DO NOT MERGE" 
This reverts commit 920745e780.

Change-Id: Ib5e8de4dc7c0583c77f355ba038e6952a99b3988
 2016-03-14 16:27:44 +00:00
Geoff Mendal
5fec9de5ae Merge "Revert "Import translations. DO NOT MERGE"" 2016-03-14 16:27:30 +00:00
Geoff Mendal
ffdeb16f53 Revert "Import translations. DO NOT MERGE" 
This reverts commit 1ab931d399.

Change-Id: Ic1fbd72c07ac43c95690f5718dedf60506146550
 2016-03-14 16:27:20 +00:00
Geoff Mendal
cfd21bd13e Import translations. DO NOT MERGE am: 920745e780 -s ours 
am: 8384d50f9c  -s ours

* commit '8384d50f9c34fc1a13c0385ac6dff692ea11f37e':
  Import translations. DO NOT MERGE
 2016-03-14 14:50:29 +00:00
Geoff Mendal
8384d50f9c Import translations. DO NOT MERGE 
am: 920745e780  -s ours

* commit '920745e7804c690249401d5b44875cd00b76b83c':
  Import translations. DO NOT MERGE
 2016-03-14 14:48:38 +00:00
Geoff Mendal
920745e780 Import translations. DO NOT MERGE 
Change-Id: If2ae5423dae2e4f4c9128fea6f37f5483ba754a5
Auto-generated-cl: translation import
 2016-03-14 07:42:45 -07:00
Geoff Mendal
1ab931d399 Import translations. DO NOT MERGE 
Change-Id: I7ce7d26b21ad0f9dece6073bcb2c214c265f2b78
Auto-generated-cl: translation import
 2016-03-14 06:32:59 -07:00
Mihai Nita
1cf4931211 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev am: 42734c1551 
am: 1705a15e29

* commit '1705a15e29a41273d3275cddcd4da4cabc3af6f3':
  Settings: change "Language & input" to -> "Languages & input"
 2016-03-12 00:15:37 +00:00
Paul Lawrence
00fbae46f4 Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev am: 0ca47e2c55 
am: bd34670f3b

* commit 'bd34670f3bd7adaf9ae8dbc7eb4997a906329b87':
  Don't show secure startup options and strings when file encrypted
 2016-03-12 00:15:37 +00:00
pkanwar
7d80a39212 Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev am: 856e72d3d5 
am: 2377d3c6b0

* commit '2377d3c6b08de5c5f8faedcef6c53f1e5be25988':
  Remove band preference in WiFi settings. Bug: b/25743379
 2016-03-12 00:15:37 +00:00
Mihai Nita
1705a15e29 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev 
am: 42734c1551

* commit '42734c1551dfac552376efad685f0215724ab518':
  Settings: change "Language & input" to -> "Languages & input"
 2016-03-12 00:07:07 +00:00
Paul Lawrence
bd34670f3b Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev 
am: 0ca47e2c55

* commit '0ca47e2c5506d286469f29c25e5d45a45623e20f':
  Don't show secure startup options and strings when file encrypted
 2016-03-12 00:07:06 +00:00
pkanwar
2377d3c6b0 Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev 
am: 856e72d3d5

* commit '856e72d3d507d3f644a3fd6410b18d4b68b15953':
  Remove band preference in WiFi settings. Bug: b/25743379
 2016-03-12 00:07:06 +00:00
Mihai Niță
42734c1551 Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev 2016-03-11 22:05:18 +00:00
Paul Lawrence
0ca47e2c55 Merge "Don't show secure startup options and strings when file encrypted" into nyc-dev 2016-03-11 21:49:16 +00:00
Paul Lawrence
23c2acfd4c Don't show secure startup options and strings when file encrypted 
File encryption is secure by default, so we don't need to warn.

Bug: 27433949
Bug: 27435082

Change-Id: I3e856256188e6a7dcd58cabbde043395c314999e
 2016-03-11 13:28:39 -08:00
Mihai Nita
d3062b90c1 Settings: change "Language & input" to -> "Languages & input" 
Because now the user can select more than one locale.

Bug: 26849449

Change-Id: I7927fb53012444afafe327e7103ada8ae9808dac
 2016-03-11 12:42:59 -08:00
Pankaj Kanwar
856e72d3d5 Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev 2016-03-11 20:38:11 +00:00
Bill Yi
466eb1a829 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 57ab609aab -s ours 
am: e7de9ec52d  -s ours

* commit 'e7de9ec52d69066c871652818ac13dab737d7d64':
  Import translations. DO NOT MERGE
 2016-03-11 19:07:25 +00:00
Bill Yi
e7de9ec52d Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 57ab609aab  -s ours

* commit '57ab609aab9781dfb23824e4e05b60e1b00d4843':
  Import translations. DO NOT MERGE
 2016-03-11 18:16:08 +00:00
Bill Yi
57ab609aab Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-11 18:10:28 +00:00
Bill Yi
00ffc901fc Merge "Import translations. DO NOT MERGE" 2016-03-11 18:10:15 +00:00
Anna Galusza
b243071676 Merge "Update preview border. Bug: 27396174" into nyc-dev am: c4d7bc85dc 
am: 33d21803cb

* commit '33d21803cb8501b0b5cd343a07ad0b4c7951eb3b':
  Update preview border. Bug: 27396174
 2016-03-11 17:55:07 +00:00
Anna Galusza
33d21803cb Merge "Update preview border. Bug: 27396174" into nyc-dev 
am: c4d7bc85dc

* commit 'c4d7bc85dc21a3acae5e7d5c4303cdaad6e3e76a':
  Update preview border. Bug: 27396174
 2016-03-11 17:53:03 +00:00
Anna Galusza
c4d7bc85dc Merge "Update preview border. Bug: 27396174" into nyc-dev 2016-03-11 17:46:35 +00:00
pkanwar
fae7e6cd97 Remove band preference in WiFi settings. 
Bug: b/25743379

Change-Id: Iddea166e0e0925fffb70de80978501945e8999a7
 2016-03-11 08:28:18 -08:00
Bill Yi
64140661e9 Import translations. DO NOT MERGE 
Change-Id: I097e4b41363cc85bf5698ee2d84d3ba502967113
Auto-generated-cl: translation import
 2016-03-11 00:37:29 -08:00
Bill Yi
d73e24569f Import translations. DO NOT MERGE 
Change-Id: Icb88765e3fe02efc0ce82869c7216f68918b623e
Auto-generated-cl: translation import
 2016-03-10 23:45:58 -08:00
Udam Saini
c74525390f Merge "Prevent settings from being announced on wifi dialog." into nyc-dev am: dccc582d26 
am: 4efdb256b8

* commit '4efdb256b8a2e0d850c3658efc52d98e05b8b78a':
  Prevent settings from being announced on wifi dialog.
 2016-03-10 23:14:52 +00:00
Udam Saini
4efdb256b8 Merge "Prevent settings from being announced on wifi dialog." into nyc-dev 
am: dccc582d26

* commit 'dccc582d268df33cdcc2fafef8522b7617538e19':
  Prevent settings from being announced on wifi dialog.
 2016-03-10 23:12:07 +00:00
Udam Saini
dccc582d26 Merge "Prevent settings from being announced on wifi dialog." into nyc-dev 2016-03-10 23:01:09 +00:00
Anna Galusza
d658c0f6af Update preview border. 
Bug: 27396174

Change-Id: I23d24246eb7a571db4548965c77428532da0b59a
 2016-03-10 13:14:30 -08:00
Jason Monk
5c34ccada7 Merge "Set condition secondary text to 70% alpha." into nyc-dev am: 6f691f21d2 
am: ed8e2a6b6c

* commit 'ed8e2a6b6c972d7607fd7757c8076259818ffb46':
  Set condition secondary text to 70% alpha.
 2016-03-10 21:01:38 +00:00
Jason Monk
ed8e2a6b6c Merge "Set condition secondary text to 70% alpha." into nyc-dev 
am: 6f691f21d2

* commit '6f691f21d21cc17411efd4114cc2bc432bb57fbf':
  Set condition secondary text to 70% alpha.
 2016-03-10 20:59:01 +00:00
Jason Monk
6f691f21d2 Merge "Set condition secondary text to 70% alpha." into nyc-dev 2016-03-10 20:46:58 +00:00
Jason Monk
4cf3540a8f Set condition secondary text to 70% alpha. 
Bug: 27556219
Change-Id: I2e8953cb20a43ebcce03c92f1a7c35c1843bc958
 2016-03-10 15:44:58 -05:00
Jason Monk
28e96a3c60 Merge "Fix large bluetooth item" into nyc-dev am: 37c04d869e 
am: bf4fc490ea

* commit 'bf4fc490ea9045a9fce7c094bd6b83d42403e461':
  Fix large bluetooth item
 2016-03-10 20:37:41 +00:00
Jason Monk
941661ae5b Merge "Rename more to other networks" into nyc-dev am: 0d44cc192b 
am: ebd0b1f070

* commit 'ebd0b1f07075d1d84f9caee05bedbba4df34ffab':
  Rename more to other networks
 2016-03-10 20:37:41 +00:00
Jason Monk
bf4fc490ea Merge "Fix large bluetooth item" into nyc-dev 
am: 37c04d869e

* commit '37c04d869e6e424ae37cb340ddc3b18741378644':
  Fix large bluetooth item
 2016-03-10 20:35:02 +00:00
Jason Monk
ebd0b1f070 Merge "Rename more to other networks" into nyc-dev 
am: 0d44cc192b

* commit '0d44cc192bd49e6775d6e70beebea7c0b21a9a21':
  Rename more to other networks
 2016-03-10 20:35:02 +00:00
Jason Monk
37c04d869e Merge "Fix large bluetooth item" into nyc-dev 2016-03-10 20:30:37 +00:00
Jason Monk
0d44cc192b Merge "Rename more to other networks" into nyc-dev 2016-03-10 20:29:46 +00:00
Jason Monk
a2950d9344 Fix large bluetooth item 
Bug: 27587071
Change-Id: I562b5b248da738440108ebeba32757b58355dbce
 2016-03-10 15:26:06 -05:00
Jason Monk
34ed8a243b Rename more to other networks 
Bug: 26780911
Change-Id: I42e1a322966b7920a281153889f44052450714b5
 2016-03-10 15:21:04 -05:00
Vladislav Kaznacheev
1fefe5faf8 Merge "Add Settings.WallpaperSettingsActivity" into nyc-dev am: ae236798f9 
am: 53cd757c8b

* commit '53cd757c8bd1b34ec4602fa6c0954034b75e1339':
  Add Settings.WallpaperSettingsActivity
 2016-03-10 20:08:42 +00:00
Vladislav Kaznacheev
53cd757c8b Merge "Add Settings.WallpaperSettingsActivity" into nyc-dev 
am: ae236798f9

* commit 'ae236798f9bf8214b387e9b25c5e783c0db5c1cb':
  Add Settings.WallpaperSettingsActivity
 2016-03-10 20:06:02 +00:00
Vladislav Kaznacheev
ae236798f9 Merge "Add Settings.WallpaperSettingsActivity" into nyc-dev 2016-03-10 20:00:50 +00:00
Vladislav Kaznacheev
6e93bdd6a2 Add Settings.WallpaperSettingsActivity 
Provide a way to open wallpaper settings directly.

Bug: 26688904
Change-Id: I3e862b45ad8a4cec59f89495c993f0852c720e55
 2016-03-10 11:38:18 -08:00