Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,225 Commits 1 Branch 0 Tags
39936ec7bb884c692069035fcdf4e09177d387ef
Commit Graph

8756 Commits

Author SHA1 Message Date
Anna Galusza
39936ec7bb Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev am: 8870706 
am: 4065586

* commit '4065586a29e70702351eece01a7955502b14dd35':
  Fix padding on Font size and Display size preview screens. Bug: 27675989
 2016-03-28 22:41:18 +00:00
Anna Galusza
4065586a29 Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev 
am: 8870706

* commit '8870706614da8244c20dc46b53376422a819a61f':
  Fix padding on Font size and Display size preview screens. Bug: 27675989
 2016-03-28 22:33:35 +00:00
Anna Galusza
8870706614 Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev 2016-03-28 18:14:49 +00:00
Fan Zhang
7d18401a14 Merge "Add a DashboardContainerFragment to host DashboardSummary." 2016-03-28 17:51:40 +00:00
Fan Zhang
94df695453 Add a DashboardContainerFragment to host DashboardSummary. 
Eventually the container fragment will host more dashboard-type
fragments. For now it's just DashboardSummary.

Change-Id: I217ad71c2f2bbc4b7247c9dd2c3c2b8c8660d945
 2016-03-28 09:35:14 -07:00
Geoff Mendal
ff750b5d82 Import translations. DO NOT MERGE 
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
 2016-03-28 07:42:47 -07:00
Geoff Mendal
1a57473dde Import translations. DO NOT MERGE 
Change-Id: I8303e337afd764231eb307766b38e08b766d8f7a
Auto-generated-cl: translation import
 2016-03-28 06:33:52 -07:00
Bill Yi
6d7f9f20ca Merge "Import translations. DO NOT MERGE" 2016-03-26 17:26:30 +00:00
Bill Yi
2d17f93122 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-26 17:26:11 +00:00
Bill Yi
2393396422 Import translations. DO NOT MERGE 
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
 2016-03-26 00:37:09 -07:00
Bill Yi
d2ec0e5219 Import translations. DO NOT MERGE 
Change-Id: I7bc995d474f548d4628f0b73991a1c8b181f0d45
Auto-generated-cl: translation import
 2016-03-25 23:52:45 -07:00
Christopher Tate
7b55a383aa Call it "Opening links" now am: 13d79b2 
am: 8d5561f

* commit '8d5561fc3e54138886e7ee76911df3f9c3f3cf99':
  Call it "Opening links" now
 2016-03-26 00:19:38 +00:00
Christopher Tate
8d5561fc3e Call it "Opening links" now 
am: 13d79b2

* commit '13d79b2a252ac4bbb55e110782f5d166d1ed4db7':
  Call it "Opening links" now
 2016-03-26 00:16:39 +00:00
Christopher Tate
13d79b2a25 Call it "Opening links" now 
Better labels are better.

Bug 27834016

Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
 2016-03-25 15:06:25 -07:00
Alan Viverette
d29d40e822 Merge "Move DensityUtils into SettingsLib" into nyc-dev am: 30dbd47 
am: 447bb2f

* commit '447bb2f7dad8133f1f18e1f3b627affda6e4bdfe':
  Move DensityUtils into SettingsLib
 2016-03-25 20:10:07 +00:00
Alan Viverette
447bb2f7da Merge "Move DensityUtils into SettingsLib" into nyc-dev 
am: 30dbd47

* commit '30dbd47a29fb12f1a5c5027d6719397fb322fe9e':
  Move DensityUtils into SettingsLib
 2016-03-25 20:06:34 +00:00
Alan Viverette
30dbd47a29 Merge "Move DensityUtils into SettingsLib" into nyc-dev 2016-03-25 19:59:38 +00:00
Alan Viverette
6b0b73fdc4 Move DensityUtils into SettingsLib 
Bug: 27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
 2016-03-25 14:56:25 -04:00
Udam Saini
fc76f5ffd4 Merge "Updates spacing on redaction interstitial" into nyc-dev am: 375b981 
am: f7e45a7

* commit 'f7e45a7f281a399ed373d6aac892d63941be33de':
  Updates spacing on redaction interstitial
 2016-03-24 22:45:00 +00:00
Udam Saini
f7e45a7f28 Merge "Updates spacing on redaction interstitial" into nyc-dev 
am: 375b981

* commit '375b981267aea4f3fb3374d2a6e18339125dd455':
  Updates spacing on redaction interstitial
 2016-03-24 22:40:16 +00:00
Udam Saini
375b981267 Merge "Updates spacing on redaction interstitial" into nyc-dev 2016-03-24 22:20:10 +00:00
Hall Liu
b8eb4a1c55 Merge "Add indicator for system dialer in Settings" into nyc-dev am: f3dc18b 
am: 736afac

* commit '736afac6cbfdc2f96fc074afbc6f25f5243fba42':
  Add indicator for system dialer in Settings
 2016-03-24 17:43:04 +00:00
Hall Liu
736afac6cb Merge "Add indicator for system dialer in Settings" into nyc-dev 
am: f3dc18b

* commit 'f3dc18b65bd78d7f00b6255208864cb6899674bc':
  Add indicator for system dialer in Settings
 2016-03-24 17:39:30 +00:00
Hall Liu
f3dc18b65b Merge "Add indicator for system dialer in Settings" into nyc-dev 2016-03-24 17:29:39 +00:00
Yorke Lee
fe803a7be4 Merge "Fix build" into nyc-dev am: d0f8d92 
am: abe553e

* commit 'abe553ed0d4bd4f268b70b4850525fb9895fb7f3':
  Fix build
 2016-03-23 18:55:10 +00:00
Yorke Lee
abe553ed0d Merge "Fix build" into nyc-dev 
am: d0f8d92

* commit 'd0f8d9257b0b1076bbc5fa567fe98c2ae460a291':
  Fix build
 2016-03-23 18:47:58 +00:00
Udam Saini
ec0baa9701 Updates spacing on redaction interstitial 
Cleans up the look and feel on the redaction interstitial page

bug:27534261
Change-Id: I9495cfc9493f0d199b30335985761d069a29d42d
 2016-03-23 11:29:15 -07:00
Yorke Lee
d0f8d9257b Merge "Fix build" into nyc-dev 2016-03-23 18:17:58 +00:00
Yorke Lee
d448522a6f Fix build 
Change-Id: I99d94806fabef469f4ad984e65a58e4f69808e68
 2016-03-23 11:11:46 -07:00
Sudheer Shanka
7d1fe37af9 Merge "Add more policy transparency for wifi settings." into nyc-dev am: ed0d4dd 
am: add53df

* commit 'add53dfcb1eec18615610a632493fb591f924170':
  Add more policy transparency for wifi settings.
 2016-03-23 18:10:59 +00:00
Sudheer Shanka
97c891b8ee Merge "Add disabled by policy empty views to more screens." into nyc-dev am: 561a88c 
am: 9ddc14e

* commit '9ddc14e7c72f4deb89c904efd2f57608c4da78ab':
  Add disabled by policy empty views to more screens.
 2016-03-23 18:10:58 +00:00
Sudheer Shanka
add53dfcb1 Merge "Add more policy transparency for wifi settings." into nyc-dev 
am: ed0d4dd

* commit 'ed0d4dd463494c011ffcbd079ec321aa1d95e2b4':
  Add more policy transparency for wifi settings.
 2016-03-23 18:06:22 +00:00
Sudheer Shanka
9ddc14e7c7 Merge "Add disabled by policy empty views to more screens." into nyc-dev 
am: 561a88c

* commit '561a88cfcd21bcfd2a02c9fa3f3575566ccf7a72':
  Add disabled by policy empty views to more screens.
 2016-03-23 18:06:21 +00:00
Sudheer Shanka
ed0d4dd463 Merge "Add more policy transparency for wifi settings." into nyc-dev 2016-03-23 17:53:19 +00:00
Sudheer Shanka
561a88cfcd Merge "Add disabled by policy empty views to more screens." into nyc-dev 2016-03-23 17:53:15 +00:00
Abodunrinwa Toki
0a35d8a5af Merge "InputSettings: Physical keyboard settings activity." into nyc-dev am: 14df560 
am: 181b63e

* commit '181b63ebe09e2ef24bc1d2ad96d79e383525ed02':
  InputSettings: Physical keyboard settings activity.
 2016-03-23 16:16:53 +00:00
Abodunrinwa Toki
181b63ebe0 Merge "InputSettings: Physical keyboard settings activity." into nyc-dev 
am: 14df560

* commit '14df56074435ef5cab4010d5c782fdd682509244':
  InputSettings: Physical keyboard settings activity.
 2016-03-23 16:12:49 +00:00
Abodunrinwa Toki
14df560744 Merge "InputSettings: Physical keyboard settings activity." into nyc-dev 2016-03-23 16:03:24 +00:00
Geoff Mendal
9203c33008 Import translations. DO NOT MERGE 
Change-Id: Ibcc935d8f8e5e2af9746f8ba9032855017110127
Auto-generated-cl: translation import
 2016-03-23 07:39:30 -07:00
Geoff Mendal
a5421e8f38 Import translations. DO NOT MERGE 
Change-Id: I39432205d099c448867c42392f9a6e574105fd43
Auto-generated-cl: translation import
 2016-03-23 06:35:05 -07:00
Abodunrinwa Toki
b28b2cc68f InputSettings: Physical keyboard settings activity. 
This CL adds functionality to trigger the "Physical keyboard"
settings screen via an intent.

Bug: 26943892
Change-Id: Ib4a0be38f94f83672501d5312079d132b2ab717d
 2016-03-22 17:17:41 +00:00
Tony Mantler
1890a9bca8 Merge "Move hint strings to SettingsLib" into nyc-dev am: 829d517 
am: 1721681

* commit '172168131a0045ecc61825cebffb3520fd1ff4eb':
  Move hint strings to SettingsLib
 2016-03-22 16:27:56 +00:00
Tony Mantler
172168131a Merge "Move hint strings to SettingsLib" into nyc-dev 
am: 829d517

* commit '829d5173d881fb02289aab3e3024e2c0c98650ab':
  Move hint strings to SettingsLib
 2016-03-22 16:24:49 +00:00
Tony Mantler
50124b5fee Move hint strings to SettingsLib 
b/18246360

Change-Id: I7b8f6badde4e0a4d47c408e2acb70ae3fe8557a9
 2016-03-21 14:51:55 -07:00
Victor Chang
f2ad4b1ffd Merge "Per vpn setting change in VPN list" into nyc-dev am: 32da1ec 
am: d0fc82f

* commit 'd0fc82fd66477a14e2f3edf646fd51321c7fa935':
  Per vpn setting change in VPN list
 2016-03-21 15:28:15 +00:00
Victor Chang
d0fc82fd66 Merge "Per vpn setting change in VPN list" into nyc-dev 
am: 32da1ec

* commit '32da1ecdca5e447268da5166f4a020ff9b54ab44':
  Per vpn setting change in VPN list
 2016-03-21 15:25:39 +00:00
Victor Chang
32da1ecdca Merge "Per vpn setting change in VPN list" into nyc-dev 2016-03-21 15:20:14 +00:00
Geoff Mendal
6aad5a1bda Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-21 14:41:10 +00:00
Geoff Mendal
92046e2274 Import translations. DO NOT MERGE 
Change-Id: Ie958cde80e3f06203380e8f77f67faff9259bd6b
Auto-generated-cl: translation import
 2016-03-21 07:40:16 -07:00
Geoff Mendal
288e1d1682 Merge "Import translations. DO NOT MERGE" 2016-03-21 13:47:06 +00:00