Commit Graph

25872 Commits

Author SHA1 Message Date
Bill Yi
937ad3c1a2 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2d17f93  -s ours

* commit '2d17f93122cc0630a1ad6bffbdcdddc16a143ac4':
  Import translations. DO NOT MERGE
2016-03-26 17:39:16 +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
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
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
Philip P. Moltmann
a18db3133a Merge "Use changed getStatus interface" into nyc-dev
am: 872f621

* commit '872f621eb358a2237f516a4bc783f3a7306ed3a6':
  Use changed getStatus interface
2016-03-25 16:56:31 +00:00
Philip P. Moltmann
872f621eb3 Merge "Use changed getStatus interface" into nyc-dev 2016-03-25 16:50:35 +00:00
Philip P. Moltmann
b05fbfa274 Use changed getStatus interface
Change-Id: I72a2aa74607e34a1afbef0982f634def3e30efd4
2016-03-24 16:53:44 -07: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
Julia Reynolds
eb9dae04ab Merge "Rules without a configuration activity aren\'t clickable." into nyc-dev
am: befc5c5

* commit 'befc5c59eb7e896ab5ec7df423f3b9eec8726f01':
  Rules without a configuration activity aren't clickable.
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
Julia Reynolds
befc5c59eb Merge "Rules without a configuration activity aren't clickable." into nyc-dev 2016-03-24 22:11:53 +00:00
Julia Reynolds
2bcb0778c3 Rules without a configuration activity aren't clickable.
Bug: 27823109
Change-Id: Ifa2291627846e562f9a04ec1e85582833ab234de
2016-03-24 15:10:25 -07:00
Robin Lee
32c3be8e03 Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev
am: 1997f76

* commit '1997f76cfc1ca3ee22d629db0504773f4f2abac3':
  Implement action "android.settings.VPN_SETTINGS"
2016-03-24 18:41:16 +00:00
Robin Lee
1997f76cfc Merge "Implement action "android.settings.VPN_SETTINGS"" into nyc-dev 2016-03-24 18:32:51 +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
Robin Lee
d3041943a7 Implement action "android.settings.VPN_SETTINGS"
Bug: 27700919
Change-Id: Ibd23f1d53d40addc2ff8ac3215f3524b7e8c9c2e
2016-03-24 16:02:08 +00:00
Daichi Hirono
28fa685ef3 Merge "Don\'t close USB type notification when USB is connected to USB devices." into nyc-dev
am: 98607d4

* commit '98607d444903f5c74fe190f65800a5679b312c4e':
  Don't close USB type notification when USB is connected to USB devices.
2016-03-24 02:50:52 +00:00
Daichi Hirono
98607d4449 Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev 2016-03-24 02:46:23 +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
0f0e2df40a Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev
am: 45949f9

* commit '45949f9138f048a9dbf9789c7bd05b751137a0fb':
  Add more policy transparency for disallow_remove_user restriction.
2016-03-23 18:06:22 +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
45949f9138 Merge "Add more policy transparency for disallow_remove_user restriction." into nyc-dev 2016-03-23 17:53:25 +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
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
qinglian.x.zhang
178b198f70 Merge "Fix no options menu on location settings screen"
am: 5c15ff9

* commit '5c15ff923d6116e7634e7c51cde76ce33ed77368':
  Fix no options menu on location settings screen
2016-03-23 16:07:28 +00:00
Abodunrinwa Toki
14df560744 Merge "InputSettings: Physical keyboard settings activity." into nyc-dev 2016-03-23 16:03:24 +00:00
Geoff Mendal
e4991bd6dd Import translations. DO NOT MERGE
am: 9203c33  -s ours

* commit '9203c33008ba048ee306bf4c3a5548ec46004c86':
  Import translations. DO NOT MERGE
2016-03-23 14:51:17 +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
Sudheer Shanka
b5c92147ce Add more policy transparency for disallow_remove_user restriction.
Bug: 27784015
Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
2016-03-22 17:24:07 -07:00
Andres Morales
130721a419 Merge "don\'t toggle OEM unlocking if the preference is not enabled" into nyc-dev
am: 950de0e

* commit '950de0e40aa1c21dc69c64980fa4dab2f1c68eb7':
  don't toggle OEM unlocking if the preference is not enabled
2016-03-22 21:34:00 +00:00
Andres Morales
950de0e40a Merge "don't toggle OEM unlocking if the preference is not enabled" into nyc-dev 2016-03-22 21:20:43 +00:00
Andres Morales
0bb6f70a87 don't toggle OEM unlocking if the preference is not enabled
Toggling the top-level switch is bypassing the disabled
state of the switch and leaving it in an inconsistent and
unrecoverable state.

Bug: 26863852
Change-Id: I9fed626b743fd6aac2c20910493bdec4778cc629
2016-03-22 12:56:29 -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
Jason Monk
230a29a1b3 Merge "Guard against monkey crash." into nyc-dev
am: 9c867a5

* commit '9c867a5703e36f47ec0f6b52fd1dc8b7d3110802':
  Guard against monkey crash.
2016-03-22 16:46:26 +00:00
Jason Monk
9c867a5703 Merge "Guard against monkey crash." into nyc-dev 2016-03-22 16:38:44 +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
Jason Monk
decc767f26 Guard against monkey crash.
Bug: 27784445
Change-Id: I4ba6e02e0cdb6857661a824ae0888feac6762a05
2016-03-22 09:17:12 -07:00
Tony Mantler
829d5173d8 Merge "Move hint strings to SettingsLib" into nyc-dev 2016-03-22 16:16:14 +00:00
Jason Monk
5c15ff923d Merge "Fix no options menu on location settings screen" 2016-03-22 16:15:34 +00:00
Nathan Harold
19acb87506 Fix Crash in the WiFi Status Test Menu
am: 582b287

* commit '582b28759551413454a7bf3e5e9e919030ceca33':
  Fix Crash in the WiFi Status Test Menu
2016-03-22 02:24:29 +00:00