Commit Graph

25897 Commits

Author SHA1 Message Date
Joe Onorato
3873f8e7cc Merge "Adapt to procstats classes which moved." into nyc-dev
am: 25b5d98

* commit '25b5d98a74cb09d02b8149eb1cb60803c4562185':
  Adapt to procstats classes which moved.
2016-03-28 22:33:36 +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
39153117f0 Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev
am: 65e940b

* commit '65e940b8c13a0a89c80cf1b83c2cd946ad2b9552':
  Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572
2016-03-28 22:33:33 +00:00
Anna Galusza
eff771423e Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev
am: c53f337

* commit 'c53f3374436ec01653a57722f709f36bfa431c5d':
  Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766
2016-03-28 22:33:30 +00:00
Joe Onorato
25b5d98a74 Merge "Adapt to procstats classes which moved." into nyc-dev 2016-03-28 20:52:38 +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
Anna Galusza
65e940b8c1 Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug: 26966572" into nyc-dev 2016-03-28 18:14:37 +00:00
Anna Galusza
c53f337443 Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug: 27579766" into nyc-dev 2016-03-28 18:14:18 +00:00
Sudheer Shanka
38a266a681 Merge "Fix crash in ApnSettings." into nyc-dev
am: 2cfda2a

* commit '2cfda2a3bd796585c02f93dae628896ac077aa98':
  Fix crash in ApnSettings.
2016-03-28 17:32:36 +00:00
Sudheer Shanka
d459e35577 Merge "Fix crash in AndroidBeam class." into nyc-dev
am: 2fff06e

* commit '2fff06e91816ff787dfcbaf4de3cb71f9ce91282':
  Fix crash in AndroidBeam class.
2016-03-28 17:32:35 +00:00
Sudheer Shanka
2cfda2a3bd Merge "Fix crash in ApnSettings." into nyc-dev 2016-03-28 17:18:54 +00:00
Sudheer Shanka
2fff06e918 Merge "Fix crash in AndroidBeam class." into nyc-dev 2016-03-28 17:18:37 +00:00
Geoff Mendal
0e4d7cf33f Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3efe250  -s ours

* commit '3efe25059f3f94167de96f9e48052bfeb61c2dfb':
  Import translations. DO NOT MERGE
2016-03-28 15:01:32 +00:00
Geoff Mendal
3efe25059f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-28 14:46:14 +00: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
Jason Monk
81ab842563 Merge changes I22d799f8,I1bc14e7a into nyc-dev
am: 2de6a28

* commit '2de6a287cad72cb7939df3702dabd4aa559fe0c9':
  Guard against crash in dev options
  Switch to whitelist for animations
2016-03-28 14:23:50 +00:00
Jason Monk
2de6a287ca Merge changes I22d799f8,I1bc14e7a into nyc-dev
* changes:
  Guard against crash in dev options
  Switch to whitelist for animations
2016-03-28 14:14:01 +00:00
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
Sudheer Shanka
4249d7589b Fix crash in ApnSettings.
ApnSettings runs with uid android.uid.phone and since it doesn't has
the MANAGE_DEVICE_ADMINS and MANAGE_PROFILE_AND_DEVICE_OWNERS
permission, show the generic support instead of the admin specific
message.

Bug: 27826969
Change-Id: I556a8b74aa1f692ebac1f4e30aeab3ed78ec5078
2016-03-24 15:39:24 -07: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
Sudheer Shanka
b51457db10 Fix crash in AndroidBeam class.
SwitchChangeListener is not added if admin disables the options, so
don't try to remove the listener in this case.

Bug: 27828118
Change-Id: Id0f9c71a10f93fc4c87af2b02ab7f04482145217
2016-03-24 12:21:45 -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
Joe Onorato
b370a8d580 Adapt to procstats classes which moved.
Change-Id: I29a04ef3a3230f688ddf13e607a755b7d7f61991
2016-03-24 11:31:06 -07: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